@voxgig/sdkgen 0.24.0 → 0.26.1

package/project/.sdk/src/cmp/js/Main_js.ts

@@ -17,8 +17,8 @@ const Main = cmp(async function Main(props: any) {
   const { target } = props
   const { model } = props.ctx$
 
-  const { entity } = model.main.api
-  const { feature } = model.main.sdk
+  const { entity } = model.main.kit
+  const { feature } = model.main.kit
 
   Package({ target })
 
@@ -72,7 +72,7 @@ const Main = cmp(async function Main(props: any) {
       }, () => {
         each(entity, (entity: any) => {
           // console.log('ENTITY', entity.name)
-          MainEntity({ target, entity, entitySDK: model.main.sdk.entity[entity.name] })
+          MainEntity({ target, entity, entitySDK: model.main.kit.entity[entity.name] })
         })
       })
     })

package/project/.sdk/src/cmp/js/Quick_js.ts

@@ -21,7 +21,7 @@ const Quick = cmp(function Quick(props: any) {
 
   // TODO: selected features should be active by default!
 
-  const featureOptions = each(model.main.sdk.feature)
+  const featureOptions = each(model.main.kit.feature)
     .filter((f: any) => f.active)
     .reduce((a: any, f: any) => a + `\n    ${f.name}: { active: true },`, '')
 

package/project/.sdk/src/cmp/ts/Config_ts.ts

@@ -1,21 +1,44 @@
 
 import * as Path from 'node:path'
 
+
 import {
-  cmp, each, indent,
-  File, Content, Fragment
+  Content,
+  File,
+  Fragment,
+  Line,
+  cmp,
+  each,
+  indent,
 } from '@voxgig/sdkgen'
 
 
+import {
+  KIT,
+  Model,
+  getModelPath,
+  nom,
+} from '@voxgig/apidef'
+
+
+import {
+  clean,
+  formatJson,
+} from './utility_ts'
 
 
 const Config = cmp(async function Config(props: any) {
-  const { target, ctx$: { model } } = props
-  const { main: { sdk: { entity } } } = model
+  const ctx$ = props.ctx$
+  const target = props.target
+
+  const model: Model = ctx$.model
+
+  const entity = getModelPath(model, `main.${KIT}.entity`)
+  const feature = getModelPath(model, `main.${KIT}.feature`)
 
   const ff = Path.normalize(__dirname + '/../../../src/cmp/ts/fragment/')
 
-  const headers = model?.main?.sdk?.config?.headers || {}
+  const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
 
   File({ name: 'Config.' + target.ext }, () => {
 
@@ -23,13 +46,37 @@ const Config = cmp(async function Config(props: any) {
       from: ff + 'Config.fragment.ts',
 
       replace: {
+
         "'HEADERS'": indent(JSON.stringify(headers, null, 2), 4).trim(),
+
+        '// #ImportFeatures': () => each(feature, (f: any) => {
+          Line(`import { ${nom(f, 'Name')}Feature } from ` +
+            `'./feature/${f.name}/${nom(f, 'Name')}Feature'`)
+        }),
+
+        '// #FeatureClasses': () => each(feature, (f: any) => {
+          Line(` ${f.name}: ${nom(f, 'Name')}Feature`)
+        }),
+
+        '// #FeatureConfigs': () => each(feature, (f: any) => {
+          Line(` ${f.name}: ${formatJson(f.config, { margin: 4 })}`)
+        }),
+
+
         '// #EntityConfigs': () => each(entity, (entity: any) => {
           Content(`
       ${entity.name}: {
       },
 `)
-        })
+        }),
+
+        "'ENTITYMAP'": formatJson(Object.values(entity)
+          .reduce((a: any, n: any) => (a[n.name] = clean({
+            fields: n.fields,
+            name: n.name,
+            op: n.op,
+            relations: n.relations,
+          }), a), {}), { margin: 2 }).trim(),
       }
     })
   })

package/project/.sdk/src/cmp/ts/EntityOperation_ts.ts

@@ -7,7 +7,7 @@ import {
 
 import { jsonify } from '@voxgig/struct'
 
-import { formatJSONSrc } from './utility_ts'
+import { formatJSONSrc, formatJson } from './utility_ts'
 
 
 const EntityOperation = cmp(function Operation(props: any) {
@@ -22,17 +22,6 @@ const EntityOperation = cmp(function Operation(props: any) {
   }
 
   const entop = entity.op[opname]
-  const path = entop.path
-
-  // // TODO: move up to to common Entity
-  // const params = JSON.stringify((path.match(/\{[^}]+\}/g) || [])
-  //   .map((p: string) => p.substring(1, p.length - 1))
-  //   .filter((p: string) => null != p && '' !== p))
-
-  // const aliasmap = JSON.stringify(entitySDK.alias.field)
-  const aliasmap = JSON.stringify(entity.alias.field)
-
-  // const hasp = '' != entop.place
 
   Fragment({
     from: ff + '/Entity' + camelify(opname) + 'Op.fragment.ts',
@@ -43,17 +32,10 @@ const EntityOperation = cmp(function Operation(props: any) {
       SdkName: model.const.Name,
       EntityName: entity.Name,
       entityname: entity.name,
-      PATH: entop.path,
-      "['PATHALT']": entop.pathalt,
-      "['PARAM-LIST']": jsonify(Object.keys(entop.param)),
-      "{ 'ALIAS': 'MAP' }": aliasmap,
-      "'REQFORM'": formatJSONSrc(JSON.stringify(entop.reqform)),
-      "'RESFORM'": formatJSONSrc(JSON.stringify(entop.resform)),
-      "'VALIDATE'": formatJSONSrc(JSON.stringify(entop.validate)),
-
+      "['ALTS']": formatJson(entop.alts, { margin: 6 }).trim(),
       '#Feature-Hook': ({ name, indent }: any) =>
         Content({ indent }, `
-fres = featurehook(ctx, '${name}')
+fres = featureHook(ctx, '${name}')
 if (fres instanceof Promise) { await fres }
 `)
 

package/project/.sdk/src/cmp/ts/Entity_ts.ts

@@ -7,7 +7,7 @@ import {
 } from '@voxgig/sdkgen'
 
 import { EntityOperation } from './EntityOperation_ts'
-import { EntityTest } from './EntityTest_ts'
+// import { EntityTest } from './EntityTest_ts'
 
 
 const Entity = cmp(function Entity(props: any) {
@@ -19,7 +19,6 @@ const Entity = cmp(function Entity(props: any) {
   }
 
   names(entrep, entity.Name, 'EntityName')
-  // console.log('ENTREP', entrep)
 
   const ff = Path.normalize(__dirname + '/../../../src/cmp/ts/fragment/')
 
@@ -46,7 +45,7 @@ const Entity = cmp(function Entity(props: any) {
 
           '#Feature-Hook': ({ name, indent }: any) =>
             Content({ indent }, `
-fres = featurehook(ctx, '${name}')
+fres = featureHook(ctx, '${name}')
 if (fres instanceof Promise) { await fres }
 `.trim()),
 
@@ -57,8 +56,7 @@ if (fres instanceof Promise) { await fres }
     })
   })
 
-
-  EntityTest({ target, entity, entrep, ff })
+  // EntityTest({ target, entity, entrep, ff })
 })
 
 

package/project/.sdk/src/cmp/ts/Main_ts.ts

@@ -7,22 +7,35 @@ import {
 } from '@voxgig/sdkgen'
 
 
+import type {
+  ModelEntity
+} from '@voxgig/apidef'
+
+
+import {
+  KIT,
+  getModelPath
+} from '@voxgig/apidef'
+
+
 import { Package } from './Package_ts'
 import { Config } from './Config_ts'
 import { MainEntity } from './MainEntity_ts'
-import { Test } from './Test_ts'
+// import { Test } from './Test_ts'
 
 
 const Main = cmp(async function Main(props: any) {
+
+  // Needs type: target object
   const { target } = props
   const { model } = props.ctx$
 
-  const { entity } = model.main.api
-  const { feature } = model.main.sdk
+  const entity: ModelEntity = getModelPath(model, `main.${KIT}.entity`)
+  const feature = getModelPath(model, `main.${KIT}.feature`)
 
   Package({ target })
 
-  Test({ target })
+  // Test({ target })
 
   Folder({ name: 'src' }, () => {
 
@@ -30,10 +43,6 @@ const Main = cmp(async function Main(props: any) {
 
       Line(`// ${model.const.Name} ${target.Name} SDK\n`)
 
-      List({ item: feature }, ({ item }: any) =>
-        Line(`import { ${item.Name + 'Feature'} } ` +
-          `from './feature/${item.name}/${item.Name}Feature'`))
-
       List({ item: entity }, ({ item }: any) =>
         Line(`import { ${item.Name}Entity } from './entity/${item.Name}Entity'`))
 
@@ -46,11 +55,11 @@ const Main = cmp(async function Main(props: any) {
             '#BuildFeatures': ({ indent }: any) => {
               List({ item: feature, line: false }, ({ item }: any) =>
                 Line({ indent },
-                  `addfeature(ctx, new ${item.Name}Feature())`))
+                  `addfeature(this._rootctx, new ${item.Name}Feature())`))
             },
 
             '#Feature-Hook': ({ name, indent }: any) => Content({ indent }, `
-fres = featurehook(ctx, '${name}')
+fres = featureHook(ctx, '${name}')
 if (fres instanceof Promise) { await fres }
 `),
 
@@ -69,8 +78,9 @@ if (fres instanceof Promise) { await fres }
 
         // Entities
         () => {
-          each(entity, (entity: any) => {
-            const entprops = { target, entity, entitySDK: model.main.api.entity[entity.name] }
+          each(entity, (entity: ModelEntity) => {
+            const entitySDK = getModelPath(model, `main.${KIT}.entity.${entity.name}`)
+            const entprops = { target, entity, entitySDK }
             MainEntity(entprops)
           })
         })

package/project/.sdk/src/cmp/ts/Package_ts.ts

@@ -1,14 +1,28 @@
 
 import {
-  cmp, omap, each, cmap,
-  File, Content,
+  Content,
+  File,
+  cmp,
+  each,
+  omap,
 } from '@voxgig/sdkgen'
 
 
+import {
+  KIT,
+  Model,
+  getModelPath,
+  nom,
+} from '@voxgig/apidef'
+
 
 const Package = cmp(async function Package(props: any) {
-  const { target, ctx$: { model } } = props
-  const { main: { sdk: { feature } } } = model
+  const ctx$ = props.ctx$
+  const target = props.target
+
+  const model: Model = ctx$.model
+
+  const feature = getModelPath(model, `main.${KIT}.feature`)
 
   const only = (kind: string, deps: any) =>
     omap(deps, ([k, v]: any) => [v.active && kind === v.kind ? k : undefined, v.version])
@@ -18,7 +32,9 @@ const Package = cmp(async function Package(props: any) {
     each(feature, (feature: any) =>
       omap(feature.deps?.[target.name], ([k, v]: any) =>
         [v.active ? k : undefined, v]))
+
       // TODO: sort by version; rules for version choice?
+      // TODO: non-node dep kinds
       .reduce((a: any, deps: any) => (each(deps, (dep: any) =>
         a[dep.kind][dep.key$] = dep.version), a),
         {
@@ -28,20 +44,22 @@ const Package = cmp(async function Package(props: any) {
         })
 
   const sdkname = model.name
+  const SdkName = nom(model, 'Name')
   const origin = null == model.origin ? '' : `@${model.origin}/`
+  const sdknamesuffix = model.origin?.endsWith('-sdk') ? '' : '-sdk'
 
   // TODO: complete SDK meta data in model and use here
   const pkg = {
-    name: `${origin}${sdkname}-sdk`,
+    name: `${origin}${sdkname}${sdknamesuffix}`,
     version: `0.0.1`,
     description: 'DESCRIPTION',
-    main: `dist/${model.const.Name}SDK.js`,
+    main: `dist/${SdkName}SDK.js`,
     type: 'commonjs',
-    types: `dist/${model.const.Name}SDK.d.ts`,
+    types: `dist/${SdkName}SDK.d.ts`,
     scripts: {
-      'test': 'node --enable-source-maps --test dist-test/**/*.test.js',
-      'test-some': 'node --enable-source-maps ' +
-        '--test-name-pattern=\"$npm_config_pattern\" --test dist-test/**/*.test.js',
+      'test': 'node --enable-source-maps --test \'dist-test/**/*.test.js\'',
+      'test-some': 'node --enable-source-maps --experimental-test-isolation=none ' +
+        '--test-name-pattern=\"$TEST_PATTERN\" --test \'dist-test/**/*.test.js\'',
       'test-utility': 'node --enable-source-maps --test test/utility/*.test.ts',
 
       "watch": "tsc --build src test -w",
@@ -49,14 +67,16 @@ const Package = cmp(async function Package(props: any) {
       "clean": "rm -rf node_modules yarn.lock package-lock.json",
       "reset": "npm run clean && npm i && npm run build && npm test",
     },
-    author: `${model.const.Name}`,
+    author: `${SdkName}`,
+
+    // TODO: needs to be config
     license: 'MIT',
+
     dependencies: deps.prod,
     peerDependencies: deps.peer,
     devDependencies: deps.dev,
   }
 
-
   File({ name: 'package.json' }, () => {
     Content(JSON.stringify(pkg, null, 2))
   })