Merge pull request #6 from commercelayer/fetch

breaking: remove axios and support to node <20

.github/workflows/codeql-analysis.yml

@@ -3,7 +3,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, beta ]
   pull_request:
     branches: [ main ]
   schedule:
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript' ]
+        language: [ 'javascript-typescript' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

.github/workflows/semantic-release.yml

@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: latest
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
           cache: 'pnpm'

.releaserc

@@ -9,8 +9,8 @@
 	"plugins": [
 		"@semantic-release/commit-analyzer",
 		"@semantic-release/release-notes-generator",
-		"@semantic-release/github",
 		"@semantic-release/npm",
+		"@semantic-release/github",
 		["@semantic-release/changelog", {
 			"changelogFile": "CHANGELOG.md"
 		}],

gen/fixer.ts

@@ -1,7 +1,9 @@
 /* eslint-disable no-console */
 import { ApiSchema } from './schema'
+import resSchema from './resources.js'
 import { sortObjectFields } from '../src/util'
-import { inspect } from 'util'
+import Inflector from './inflector.js'
+import { CONFIG } from './generator.js'
 
 
 
@@ -30,24 +32,69 @@ const fixRedundantComponents = (schema: ApiSchema): ApiSchema => {
 		res.components = sortObjectFields(res.components)
 
 	})
-	
+
 	console.log('Redundant components have been replaced')
 
 	return schema
 
 }
 
 
-const fixSchema = (schema: ApiSchema): ApiSchema => {
+const fixSchema = async (schema: ApiSchema): Promise<ApiSchema> => {
+
 	console.log('Fixing parsed schema...')
-	const fixedSchema = fixRedundantComponents(schema)
+
+	let fixedSchema = schema
+	fixedSchema = fixRedundantComponents(fixedSchema)
+	fixedSchema = await enrichSchema(fixedSchema)
+
 	console.log('Schema fixed.')
+
 	return fixedSchema
+
 }
 
 
-export default fixSchema
+const enrichSchema = async (schema: ApiSchema): Promise<ApiSchema> => {
+
+	const resourcesInfo = CONFIG.LOCAL? resSchema.load() : await resSchema.download()
+
+	if (!resourcesInfo) {
+		console.log('Error reading reasources data')
+		process.exit()
+	}
+
+	Object.entries(schema.components).forEach(([key, val]) => {
+		const resId = Inflector.snakeCase(key)
+		const resFields = resSchema.getResourceFields(resourcesInfo, resId)
+		if (resFields) Object.entries(val.attributes).forEach(([name, info]) => {
+			const field = resFields[name]
+			if (!field) console.log(`Warning, field not found in resources data: ${resId}.${name}`)
+			info.sortable = field?.sortable || false
+			info.filterable = field?.filterable || false
+		})
+	})
+
+
+	Object.values(schema.resources).forEach(r => {
+		Object.entries(r.components).forEach(([key, val]) => {
+			const resId = Inflector.snakeCase(key)
+			const resFields = resSchema.getResourceFields(resourcesInfo, resId)
+			if (resFields) Object.entries(val.attributes).forEach(([name, info]) => {
+				const field = resFields[name]
+				if (!field) console.log(`Warning, field not found in resources data: ${resId}.${name}`)
+				info.sortable = field?.sortable || false
+				info.filterable = field?.filterable || false
+			})
+		})
+	})
+
 
+	console.log('Api schema has been enriched with resources data')
+
+	return schema
+
+}
 
 
 const fixHeadingEmptyLines = (lines: string[]): string[] => {
@@ -62,4 +109,8 @@ const fixHeadingEmptyLines = (lines: string[]): string[] => {
 }
 
 
-export { fixHeadingEmptyLines }
+
+export default {
+	fixSchema,
+	fixHeadingEmptyLines
+}