@voxgig/sdkgen 0.22.0 → 0.23.0

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

@@ -0,0 +1,180 @@
+
+import {
+  cmp,
+  File, Content, Folder, Fragment, Slot
+} from '@voxgig/sdkgen'
+
+import { jsonify } from '@voxgig/struct'
+
+
+
+
+const EntityTest = cmp(function EntityTest(props: any) {
+  const ctx$ = props.ctx$
+  const { model } = props.ctx$
+  const { target, entity, entrep, ff } = props
+
+  Folder({ name: 'test/entity' }, () => {
+
+    File({ name: entity.Name + 'Entity.test.' + target.name }, () => {
+
+      Fragment({
+        from: ff + 'Entity.test.fragment.ts',
+        replace: {
+          ...entrep
+        }
+      }, () => {
+
+        // TODO: should be EntityFlow
+        const basicflow = model?.main?.sdk?.flow?.['Basic' + entity.Name + 'Flow']
+
+        const dobasic = basicflow && true === basicflow.active
+
+        if (!dobasic) {
+          return;
+        }
+
+        let indent = 2
+
+        Slot({ name: 'basicSetup' }, () => {
+          Content(`
+function basicSetup(extra?: any) {
+  extra = extra || {}
+
+  const options = ${jsonify(basicflow.test, { offset: indent - 2 })}
+
+  const setup: any = {
+    dm: {
+      p: envOverride(${jsonify(basicflow.param, { offset: 2 + indent })}),
+      s: {},
+    },
+    options,
+  }
+
+  const { merge } = utility.struct
+
+  let client = ${model.Name}SDK.test(options, extra)
+  if ('TRUE' === setup.dm.p.${model.NAME}_TEST_LIVE) {
+    client = new ${model.Name}SDK(merge([
+      {
+        apikey: process.env.${model.Name}_APIKEY,
+      },
+      extra])
+    )
+  }
+  
+  setup.client = client    
+  setup.struct = client.utility().struct
+  setup.explain = 'TRUE' === setup.dm.p.${model.Name}_TEST_EXPLAIN
+
+  return setup
+}
+`)
+        })
+
+
+        indent = 6
+        Slot({ name: 'basic' }, () => {
+          Content(`
+    const setup = basicSetup()
+    const { dm, options, client, struct, explain } = setup
+    const { validate, transform } = struct
+    let ctrl: any = {}
+
+    try {
+`)
+
+          ctx$.util.makeFlow(basicflow, {
+            indent: indent,
+            model,
+          }, {
+            FlowStep:
+              '\n// Step: $$__stepdef.name$$ - $$__stepdef.action$$ $$__stepdef.entity$$\n',
+
+            GetEntity: [
+              'const $$__stepdef.name$$ = makeStepData(dm, \'$$__stepdef.name$$\')\n',
+              (stepdef: any, pctx: any) => pctx.data.step[stepdef.name] = stepdef,
+              [
+                '__stepdef._ref',
+                '$$__stepdef.name$$.entity = $$__stepdef._ref$$.entity\n',
+                '$$__stepdef.name$$.entity = client.$$__stepdef.Entity$$()\n',
+              ],
+            ],
+
+            EntityMatch: [
+              (stepdef: any) => stepdef.match_JSON = jsonify(stepdef.match),
+              [
+                '__stepdef.match',
+                '$$__stepdef.name$$.match = makeMatch(dm, transform, $$__stepdef.match_JSON$$)\n'
+              ]
+            ],
+
+            EntityData: [
+              (stepdef: any) => stepdef.reqdata_JSON = jsonify(stepdef.reqdata),
+              [
+                '__stepdef.reqdata',
+                '$$__stepdef.name$$.reqdata = ' +
+                'makeReqdata(dm, transform, $$__stepdef.reqdata_JSON$$)\n'
+              ]
+            ],
+
+            EntityAction: [
+              // 'ctrl = explain ? { explain: {} } : undefined\n',
+              [
+                { __stepdef: { action: { '`$OR`': ['update', 'create', 'remove'] } } },
+                '$$__stepdef.name$$.resdata =\n' +
+                '  await $$__stepdef.name$$.entity.$$__stepdef.action$$(' +
+                '$$__stepdef.name$$.reqdata, ctrl = makeCtrl(explain))\n'
+              ],
+              [
+                { __stepdef: { action: 'load' } },
+                '$$__stepdef.name$$.resdata =\n' +
+                '  await $$__stepdef.name$$.entity.load($$__stepdef.name$$.match, ctrl = makeCtrl(explain))\n'
+              ],
+              [
+                { __stepdef: { action: 'list' } },
+                '$$__stepdef.name$$.reslist =\n' +
+                '  await $$__stepdef.name$$.entity.list($$__stepdef.name$$.match, ctrl = makeCtrl(explain))\n'
+              ],
+            ],
+
+            ExplainAction:
+              'if( explain ) { console.log(\'$$__stepdef.name$$: \', ctrl.explain) }\n',
+
+            ValidateAction: [
+              (stepdef: any) => {
+                stepdef.valid_JSON = jsonify(stepdef.valid)
+                stepdef.reslist_DATA =
+                  null == stepdef.reslist ? [] : stepdef.reslist.map((ent: any) => ent.data())
+              },
+              [
+                { __stepdef: { action: { '`$OR`': ['load', 'update', 'create', 'remove'] } } },
+                'makeValid(dm, validate, $$__stepdef.name$$.resdata, ' +
+                '$$__stepdef.valid_JSON$$)\n'
+              ],
+              [
+                { __stepdef: { action: 'list' } },
+                'makeValid(dm, validate, $$__stepdef.name$$.reslist_DATA, ' +
+                '$$__stepdef.valid_JSON$)\n'
+              ],
+            ]
+          })
+
+          Content(` 
+    }
+    catch(err: any) {
+      console.dir(dm, {depth: null})
+      if( explain ) { console.dir(ctrl.explain, {depth: null}) }
+      throw err
+    }
+`)
+        })
+      })
+    })
+  })
+})
+
+
+export {
+  EntityTest
+}

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

@@ -2,92 +2,67 @@
 import * as Path from 'node:path'
 
 import {
-  cmp, each, camelify,
-  File, Content, Folder, Fragment, Line, FeatureHook,
+  cmp, each, camelify, names,
+  File, Content, Folder, Fragment, Line, FeatureHook, Slot
 } from '@voxgig/sdkgen'
 
+import { EntityOperation } from './EntityOperation_ts'
+import { EntityTest } from './EntityTest_ts'
 
 
-const Operation = cmp(function Operation(props: any) {
-  const { ff, opname, indent, entity, entitySDK } = props
-
-  const entop = entity.op[opname]
-  const path = entop.path
-  // console.log('ENTOP', entop)
-
-  // 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 hasp = '' != entop.place
-
-  Fragment({
-    from: ff + '/Entity' + camelify(opname) + 'Op.fragment.js',
-    indent,
-    replace: {
-      Name: entity.Name,
-      PATH: entop.path,
-      "['PARAM-LIST']": params,
-      "{'ALIAS':'MAP'}": aliasmap,
-      "'REQFORM'": JSON.stringify(entop.reqform),
-      "'RESFORM'": JSON.stringify(entop.resform),
-      'class EntityOperation { // REMOVED': '',
-      '} // REMOVED': '',
-
-      '#Feature-Hook': ({ name, indent }: any) =>
-        FeatureHook({ name }, (f: any) =>
-          Line({ indent },
-            `${f.await ? 'await ' : ''}this.#features.${f.name}.${name}(ctx)`)),
-    }
-  })
-})
-
+const Entity = cmp(function Entity(props: any) {
+  const { model, stdrep } = props.ctx$
+  const { target, entity } = props
 
+  const entrep = {
+    ...stdrep,
+  }
 
-const Entity = cmp(function Entity(props: any) {
-  const { target, entity, entitySDK } = props
-  // console.log('ENTITY', props)
+  names(entrep, entity.Name, 'EntityName')
+  // console.log('ENTREP', entrep)
 
   const ff = Path.normalize(__dirname + '/../../../src/cmp/ts/fragment/')
 
-  // Folder({ name: 'src/entity' }, () => {
+  Folder({ name: 'src/entity' }, () => {
 
-  //   File({ name: entity.Name + 'Entity.' + target.name }, () => {
+    File({ name: entity.Name + 'Entity.' + target.name }, () => {
 
-  //     const opnames = Object.keys(entity.op)
+      const opnames = Object.keys(entity.op)
 
-  //     const opfrags =
-  //       (['load', 'list', 'create', 'update', 'remove']
-  //         .reduce((a: any, opname: string) =>
-  //         (a['#' + camelify(opname) + 'Op'] =
-  //           !opnames.includes(opname) ? '' : ({ indent }: any) => {
-  //             Operation({ ff, opname, indent, entity, entitySDK })
-  //           }, a), {}))
+      const opfrags =
+        (['load', 'list', 'create', 'update', 'remove']
+          .reduce((a: any, opname: string) =>
+          (a['#' + camelify(opname) + 'Op'] =
+            !opnames.includes(opname) ? '' : ({ indent }: any) => {
+              EntityOperation({ ff, opname, indent, entity, entrep })
+            }, a), {}))
 
-  //     Fragment({
-  //       from: ff + 'Entity.fragment.js',
-  //       replace: {
-  //         Name: entity.Name,
+      Fragment({
+        from: ff + 'Entity.fragment.ts',
+        replace: {
+          ...entrep,
+          SdkName: model.const.Name,
+          EntityName: entity.Name,
 
-  //         '#Feature-Hook': ({ name, indent }: any) =>
-  //           FeatureHook({ name }, (f: any) =>
-  //             Line({ indent },
-  //               `${f.await ? 'await ' : ''}this.#features.${f.name}.${name}({entity:this})`)),
+          '#Feature-Hook': ({ name, indent }: any) =>
+            Content({ indent }, `
+fres = featurehook(ctx, '${name}')
+if (fres instanceof Promise) { await fres }
+`.trim()),
 
-  //         ...opfrags,
-  //       }
-  //     })
+          ...opfrags,
+        }
+      })
+
+    })
+  })
 
-  //   })
-  // })
 
+  EntityTest({ target, entity, entrep, ff })
 })
 
 
+
 export {
   Entity
 }

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

@@ -0,0 +1,22 @@
+
+
+import { cmp, Content } from '@voxgig/sdkgen'
+
+
+const MainEntity = cmp(async function MainEntity(props: any) {
+  const { entity } = props
+
+  Content(`
+  ${entity.Name}(data?: any) {
+    const self = this
+    return new ${entity.Name}Entity(self,data)
+  }
+
+`)
+
+})
+
+
+export {
+  MainEntity
+}

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

@@ -9,8 +9,8 @@ import {
 
 import { Package } from './Package_ts'
 import { Config } from './Config_ts'
-//import { MainEntity } from './MainEntity_ts'
-//import { Test } from './Test_ts'
+import { MainEntity } from './MainEntity_ts'
+import { Test } from './Test_ts'
 
 
 const Main = cmp(async function Main(props: any) {
@@ -22,60 +22,59 @@ const Main = cmp(async function Main(props: any) {
 
   Package({ target })
 
-  // Test({ target })
+  Test({ target })
 
   Folder({ name: 'src' }, () => {
 
-    // File({ name: model.const.Name + 'SDK.' + target.name }, () => {
-
-    //   Line(`// ${model.const.Name} ${target.Name} SDK\n`)
-
-    //   List({ item: feature }, ({ item }: any) =>
-    //     Line(`const { ${item.Name + 'Feature'} } = ` +
-    //       `require('./feature/${item.name}/${item.Name}Feature')`))
-
-    //   List({ item: entity }, ({ item }: any) =>
-    //     Line(`const { ${item.Name}Entity } = require('./entity/${item.Name}Entity')`))
-
-    //   Fragment({
-    //     from: Path.normalize(__dirname + '/../../../src/cmp/js/fragment/Main.fragment.js'),
-    //     replace: {
-    //       Name: model.const.Name,
-
-
-    //       '#FeatureOptions': ({ indent }: any) =>
-    //         Line({ indent }, `const fopts = this.#options.feature || {}`),
-
-    //       '#BuildFeature': ({ indent }: any) => {
-    //         List({ item: feature, line: false }, ({ item }: any) =>
-    //           Line({ indent }, `${item.name}: ` +
-    //             `new ${item.Name}Feature(this, fopts.${item.name}, ` +
-    //             `${JSON.stringify(item.config || {})}), `))
-    //       },
-
-    //       '#Feature-Hook': ({ name, indent }: any) =>
-    //         FeatureHook({ name }, (f: any) =>
-    //           Line({ indent },
-    //             `${f.await ? 'await ' : ''}this.#features.${f.name}.${name}({ client: this })`)),
-
-    //       '#TestOptions': ({ indent }: any) => {
-    //         const topts = {
-    //           feature: cmap(feature, {
-    //             active: false
-    //           }),
-    //         }
-    //         Content({ indent },
-    //           JSON.stringify(topts, null, 2)
-    //             .replace(/^{\n  /, '').replace(/\n}$/, ',\n').replace(/\n  /g, '\n'))
-    //       }
-    //     }
-    //   }, () => {
-    //     each(entity, (entity: any) => {
-    //       // console.log('ENTITY', entity.name)
-    //       MainEntity({ target, entity, entitySDK: model.main.sdk.entity[entity.name] })
-    //     })
-    //   })
-    // })
+    File({ name: model.const.Name + 'SDK.' + target.name }, () => {
+
+      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'`))
+
+      Fragment(
+        {
+          from: Path.normalize(__dirname + '/../../../src/cmp/ts/fragment/Main.fragment.ts'),
+          replace: {
+            ...props.ctx$.stdrep,
+
+            '#BuildFeatures': ({ indent }: any) => {
+              List({ item: feature, line: false }, ({ item }: any) =>
+                Line({ indent },
+                  `addfeature(ctx, new ${item.Name}Feature())`))
+            },
+
+            '#Feature-Hook': ({ name, indent }: any) => Content({ indent }, `
+fres = featurehook(ctx, '${name}')
+if (fres instanceof Promise) { await fres }
+`),
+
+            '#TestOptions': ({ indent }: any) => {
+              const topts = {
+                feature: cmap(feature, {
+                  active: false
+                }),
+              }
+              Content({ indent },
+                JSON.stringify(topts, null, 2)
+                  .replace(/^{\n  /, '').replace(/\n}$/, ',\n').replace(/\n  /g, '\n'))
+            }
+          }
+        },
+
+        // Entities
+        () => {
+          each(entity, (entity: any) => {
+            const entprops = { target, entity, entitySDK: model.main.api.entity[entity.name] }
+            MainEntity(entprops)
+          })
+        })
+    })
 
     Config({ target })
 

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

@@ -16,7 +16,7 @@ const Package = cmp(async function Package(props: any) {
   // merge target and feature deps, by kind
   const deps =
     each(feature, (feature: any) =>
-      omap(feature.deps[target.name], ([k, v]: any) =>
+      omap(feature.deps?.[target.name], ([k, v]: any) =>
         [v.active ? k : undefined, v]))
       // TODO: sort by version; rules for version choice?
       .reduce((a: any, deps: any) => (each(deps, (dep: any) =>
@@ -27,17 +27,22 @@ const Package = cmp(async function Package(props: any) {
           dev: only('dev', target.deps),
         })
 
+  const sdkname = model.name
+  const origin = null == model.origin ? '' : `@${model.origin}/`
+
   // TODO: complete SDK meta data in model and use here
   const pkg = {
-    name: `${model.const.name}-sdk`,
+    name: `${origin}${sdkname}-sdk`,
     version: `0.0.1`,
     description: 'DESCRIPTION',
-    main: `src/${model.const.Name}SDK.js`,
+    main: `dist/${model.const.Name}SDK.js`,
+    type: 'commonjs',
+    types: `dist/${model.const.Name}SDK.d.ts`,
     scripts: {
-      'test': 'node --test test/*.test.js',
-      'test-utility': 'node --test test/utility/*.test.js',
-      'test-accept': 'node --test test/accept/*.test.js',
-      'test-all': 'npm run test && npm run test-utility',
+      '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-utility': 'node --enable-source-maps --test test/utility/*.test.ts',
 
       "watch": "tsc --build src test -w",
       "build": "tsc --build src test",

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

@@ -0,0 +1,19 @@
+
+import { cmp, Content } from '@voxgig/sdkgen'
+
+
+const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
+  const { target } = props
+
+  Content('```ts')
+  Content(`
+npm install ${target.module.name}
+`)
+  Content('```')
+
+})
+
+
+export {
+  ReadmeInstall
+}

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

@@ -0,0 +1,24 @@
+
+import { cmp, Content } from '@voxgig/sdkgen'
+
+
+const ReadmeQuick = cmp(function ReadmeQuick(props: any) {
+  const { target, ctx$: { model } } = props
+
+  Content('```ts')
+  Content(`
+const { ${model.const.Name}SDK } = require('${target.module.name}')
+
+const client = ${model.const.Name}SDK.make({
+  apikey: process.env.${model.NAME}_APIKEY,
+})
+
+`)
+  Content('```')
+
+})
+
+
+export {
+  ReadmeQuick
+}

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

@@ -0,0 +1,13 @@
+
+import { cmp, camelify, Content } from '@voxgig/sdkgen'
+
+
+const TestEntity = cmp(function TestEntity(props: any) {
+  const { entity } = props
+
+})
+
+
+export {
+  TestEntity
+}

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

@@ -0,0 +1,19 @@
+
+import { cmp, each, File, Content } from '@voxgig/sdkgen'
+
+
+import { TestEntity } from './TestEntity_ts'
+
+
+const TestMain = cmp(function TestMain(props: any) {
+  const { target } = props
+  const { model } = props.ctx$
+
+
+})
+
+
+export {
+  TestMain
+}
+

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

@@ -0,0 +1,20 @@
+
+import { cmp, Folder } from '@voxgig/sdkgen'
+
+// import { Quick } from './Quick_ts'
+import { TestMain } from './TestMain_ts'
+
+
+const Test = cmp(function Test(props: any) {
+  const { target } = props
+
+  Folder({ name: 'test' }, () => {
+    // Quick({ target })
+    TestMain({ target })
+  })
+})
+
+
+export {
+  Test
+}

package/project/.sdk/src/cmp/ts/fragment/Config.fragment.ts

@@ -1,7 +1,14 @@
 
 const Config = {
+
   options: {
-    base: '${def.servers[0].url}',
+    base: '$$main.def.servers.0.url$$',
+
+    auth: {
+      prefix: '$$main.sdk.config.auth.prefix$$',
+    },
+
+    headers: 'HEADERS',
 
     entity: {
       // #EntityConfigs