@voxgig/sdkgen 0.24.0 → 0.26.1

package/src/action/action.ts

@@ -34,8 +34,7 @@ function loadContent(actx: ActionContext, which: string | string[]) {
   const content: any = {}
 
   const fs = actx.fs()
-  const tree = actx.tree
-  const modelfolder = Path.dirname(tree.url)
+  const modelfolder = Path.dirname(actx.url)
 
   which.map((w: string) => {
     const indexfile = Path.join(modelfolder, w, w + '-index.jsonic')

package/src/action/feature.ts

@@ -13,6 +13,10 @@ import {
 
 import { showChanges } from '@voxgig/util'
 
+import {
+  KIT
+} from '../types'
+
 import type {
   ActionContext,
   ActionResult,
@@ -68,7 +72,8 @@ async function feature_add(features: string[], actx: ActionContext): Promise<Act
     log: actx.log.child({ cmp: 'jostraca' }),
     meta: {
       // model: actx.model,
-      tree: actx.tree,
+      // tree: actx.tree,
+      url: actx.url,
       content: loadContent(actx, 'feature')
     },
     model: actx.model
@@ -98,7 +103,7 @@ const FeatureRoot = cmp(function FeatureRoot(props: any) {
   const { ctx$, features } = props
   const { model, log } = ctx$
 
-  const target = model.main.sdk.target
+  const target = model.main[KIT].target
 
   Project({}, () => {
     each(features, (n) => {

package/src/action/target.ts

@@ -14,6 +14,10 @@ import { showChanges } from '@voxgig/util'
 
 import { getelem } from '@voxgig/struct'
 
+import {
+  KIT
+} from '../types'
+
 import type {
   ActionContext,
   ActionResult,
@@ -36,11 +40,6 @@ const CMD_MAP: any = {
 }
 
 
-type Target = {
-  origin: string
-  name: string
-}
-
 
 async function action_target(args: string[], actx: ActionContext): Promise<ActionResult> {
   const cmdname = args[1]
@@ -75,7 +74,8 @@ async function target_add(targets: string[], actx: ActionContext): Promise<Actio
     log: actx.log.child({ cmp: 'jostraca' }),
     meta: {
       // model: actx.model,
-      tree: actx.tree,
+      // tree: actx.tree,
+      url: actx.url,
       content: loadContent(actx, 'target')
     },
     model: actx.model,
@@ -91,7 +91,7 @@ async function target_add(targets: string[], actx: ActionContext): Promise<Actio
 
   showChanges(opts.log, 'target-result', jres)
 
-  const features = Object.keys(actx.model.main.sdk.feature)
+  const features = Object.keys(actx.model.main[KIT].feature)
   await feature_add(features, actx)
 
   opts.log.info({

package/src/cmp/Entity.ts

@@ -6,11 +6,17 @@ import {
 import { requirePath } from '../utility'
 
 
+import {
+  KIT,
+  getModelPath
+} from '../types'
+
+
 const Entity = cmp(function Entity(props: any) {
   const { target, entity, ctx$ } = props
   const { log } = ctx$
 
-  const entitySDK = ctx$.model.main.sdk.entity[entity.name]
+  const entitySDK = getModelPath(ctx$.model, `main.${KIT}.entity.${entity.name}`)
 
   const Entity_sdk = requirePath(ctx$, `./cmp/${target.name}/Entity_${target.name}`)
   Entity_sdk['Entity']({ target, entity, entitySDK })

package/src/cmp/FeatureHook.ts

@@ -1,11 +1,16 @@
 
 import { each, cmp, names, Content } from 'jostraca'
 
+import {
+  KIT,
+  getModelPath
+} from '../types'
+
 
 const FeatureHook = cmp(function FeatureHook(props: any, children: any) {
   const { ctx$: { model } } = props
 
-  const { feature } = model.main.sdk
+  const feature = getModelPath(model, `main.${KIT}.feature`)
 
   const hook: any = {}
   names(hook, props.name)

package/src/cmp/Main.ts

@@ -3,6 +3,10 @@ import { cmp, names, Copy } from 'jostraca'
 
 import { requirePath } from '../utility'
 
+import {
+  KIT
+} from '../types'
+
 
 const Main = cmp(function Main(props: any) {
   const { target, ctx$ } = props

package/src/cmp/ReadmeEntity.ts

@@ -1,11 +1,16 @@
 
 import { cmp, each, Content } from 'jostraca'
 
+import {
+  KIT,
+  getModelPath
+} from '../types'
+
 
 const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
   const { ctx$: { model } } = props
 
-  const { entity } = model.main.sdk
+  const entity = getModelPath(model, `main.${KIT}.entity`)
 
   Content(`
 

package/src/cmp/Test.ts

@@ -0,0 +1,31 @@
+
+import {
+  cmp,
+} from 'jostraca'
+
+import { requirePath } from '../utility'
+
+
+import {
+  KIT,
+  getModelPath
+} from '../types'
+
+
+const Test = cmp(function Test(props: any) {
+  const { target, ctx$ } = props
+  const { model, stdrep, log } = ctx$
+
+  const Test_sdk = requirePath(ctx$, `./cmp/${target.name}/Test_${target.name}`)
+  Test_sdk['Test']({ model, target, stdrep })
+
+  log.info({
+    point: 'generate-test', target,
+    note: 'target:' + target.name
+  })
+})
+
+
+export {
+  Test
+}

package/src/sdkgen.ts

@@ -1,4 +1,4 @@
-/* Copyright (c) 2024 Richard Rodger, MIT License */
+/* Copyright (c) 2024-2025 Richard Rodger, MIT License */
 
 import Fs from 'node:fs'
 import Path from 'node:path'
@@ -7,7 +7,7 @@ import { prettyPino, Pino } from '@voxgig/util'
 
 import { Jsonic } from 'jsonic'
 import * as JostracaModule from 'jostraca'
-import { Aontu, Context } from 'aontu'
+import { Aontu } from 'aontu'
 
 import {
   showChanges,
@@ -25,6 +25,7 @@ import { Main } from './cmp/Main'
 import { Entity } from './cmp/Entity'
 import { Feature } from './cmp/Feature'
 import { Readme } from './cmp/Readme'
+import { Test } from './cmp/Test'
 import { ReadmeInstall } from './cmp/ReadmeInstall'
 import { ReadmeOptions } from './cmp/ReadmeOptions'
 import { ReadmeEntity } from './cmp/ReadmeEntity'
@@ -82,6 +83,9 @@ const ACTION_MAP: any = {
 const dlog = getdlog('sdkgen', __filename)
 
 
+const aontu = new Aontu()
+
+
 function SdkGen(opts: SdkGenOptions) {
   const fs = opts.fs || Fs
   const folder = opts.folder || '../'
@@ -150,29 +154,29 @@ function SdkGen(opts: SdkGenOptions) {
     const pargs = args.map(arg => Jsonic(arg))
 
     const actname = args[0]
-    const action = ACTION_MAP[actname]
+    const actionFunc = ACTION_MAP[actname]
 
-    if (null == action) {
+    if (null == actionFunc) {
       throw new SdkGenError('Unknown action: ' + actname)
     }
 
     const ctx = resolveActionContext()
 
-    await action(pargs, ctx)
+    await actionFunc(pargs, ctx)
   }
 
 
   function resolveActionContext(): ActionContext {
 
     // TODO: use AsyncLocalStorage to avoid reloading model
-    const { model, tree } = resolveModel()
+    const { model, url } = resolveModel()
 
     const ctx: ActionContext = {
       fs: () => fs,
       log,
       folder: '.', // The `generate` folder,
       model,
-      tree,
+      url,
       jostraca,
       opts,
     }
@@ -183,14 +187,14 @@ function SdkGen(opts: SdkGenOptions) {
 
   function resolveModel() {
     const path = './model/sdk.jsonic'
-    const aopts = { path }
+    const errs: any[] = []
+    const aopts = { path, errs }
     const src = fs.readFileSync(path, 'utf8')
 
-    const tree = Aontu(src, aopts)
-    const hasErr = tree.err && 0 < tree.err.length
+    const model = aontu.generate(src, aopts)
 
-    if (hasErr) {
-      for (let serr of tree.err) {
+    if (0 < errs.length) {
+      for (let serr of errs) {
         let err: any = new SdkGenError('Model Error: ' + serr.msg)
         err.cause$ = [serr]
 
@@ -198,31 +202,11 @@ function SdkGen(opts: SdkGenOptions) {
           err.uxmsg$ = true
         }
 
-        // log.error({ fail: 'parse', point: 'guide-parse', file: path, err })
-
-
-        err.rooterrs$ = tree.err
+        err.rooterrs$ = errs
         throw err
       }
     }
 
-    let genctx = new Context({ root: tree })
-    const model = tree.gen(genctx)
-
-    // TODO: collect all errors
-    if (genctx.err && 0 < genctx.err.length) {
-      const err: any = new SdkGenError('Model Error:\n' +
-        (genctx.err.map((pe: any) => pe.msg)).join('\n'))
-      // log.error({ fail: 'build', what: 'guide', file: path, err })
-      err.errs = () => genctx.err
-      throw err
-    }
-
-    // TODO: FIX: This is a hack to set the correct src file
-    // aontu bug: url is empty
-    tree.url = path
-
-
     model.const = { name: model.name }
 
     names(model.const, model.name)
@@ -231,7 +215,7 @@ function SdkGen(opts: SdkGenOptions) {
 
     return {
       model,
-      tree,
+      url: path,
     }
   }
 
@@ -369,6 +353,7 @@ export {
   Main,
   Entity,
   Feature,
+  Test,
   Readme,
   ReadmeInstall,
   ReadmeOptions,

package/src/types.ts

@@ -6,6 +6,11 @@ import type {
 } from 'jostraca'
 
 
+import {
+  KIT,
+  getModelPath,
+} from '@voxgig/apidef'
+
 type FsUtil = typeof Fs
 
 
@@ -14,7 +19,7 @@ type ActionContext = {
   log: any,
   folder: string,
   model: any,
-  tree: any,
+  url: string,
   opts: any,
   jostraca: any
 }
@@ -25,6 +30,10 @@ type ActionResult = {
 }
 
 
+export {
+  KIT,
+  getModelPath,
+}
 
 export type {
   ActionContext,

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

@@ -1,180 +0,0 @@
-
-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/tm/ts/src/utility/OperatorUtility.ts

@@ -1,90 +0,0 @@
-
-import { Context, Operation } from '../types'
-
-import { getprop } from './StructUtility'
-
-
-const OPKIND: any = {
-  create: 'req',
-  update: 'req',
-  remove: 'req',
-  load: 'res',
-  list: 'res',
-}
-
-
-function opify(opmap: Record<string, any>) {
-
-  const validate = getprop(opmap, 'validate', {})
-
-  const op: Operation = {
-    name: getprop(opmap, 'name', '_'),
-    kind: getprop(opmap, 'kind', '_'),
-    path: getprop(opmap, 'path', '_'),
-    pathalt: getprop(opmap, 'pathalt', []),
-    entity: getprop(opmap, 'entity', '_'),
-    reqform: getprop(opmap, 'reqform', '_'),
-    resform: getprop(opmap, 'resform', '_'),
-    validate: {
-      params: getprop(validate, 'params', { '`$OPEN`': true }),
-    },
-
-    params: getprop(opmap, 'params', []),
-    alias: getprop(opmap, 'alias', {}),
-    state: getprop(opmap, 'state', {}),
-    check: getprop(opmap, 'check', {}),
-  }
-
-  return op
-}
-
-
-// Ensure standard operation definition.
-function operator(ctx: Context): Operation {
-  const { op, utility } = ctx
-  const { validate } = utility.struct
-
-  const opspec = {
-
-    // Required.
-    name: '`$STRING`',
-    kind: ['`$ONE`', 'req', 'res'],
-    path: '`$STRING`',
-    entity: '`$STRING`',
-    reqform: ['`$ONE`', '`$STRING`', '`$OBJECT`', '`$ARRAY`', '`$FUNCTION`'],
-    resform: ['`$ONE`', '`$STRING`', '`$OBJECT`', '`$ARRAY`', '`$FUNCTION`'],
-    validate: {
-      params: '`$OBJECT`'
-    },
-
-    // Optional.
-    pathalt: ['`$CHILD`', {
-      path: '`$STRING`',
-      '`$OPEN`': true,
-      // '`$CHILD`': '`$BOOLEAN`'
-    }],
-    params: ['`$CHILD`', '`$STRING`'],
-    alias: { '`$CHILD`': '`$STRING`' },
-    state: {},
-    check: {},
-  }
-
-  ctx.op.kind = OPKIND[op.name]
-
-  const opv = ctx.op.validate
-  ctx.op = validate(ctx.op, opspec)
-
-  ctx.op.validate = opv
-
-  if (ctx.ctrl.explain) {
-    ctx.ctrl.explain.op = ctx.op
-  }
-
-  return ctx.op
-}
-
-
-export {
-  opify,
-  operator,
-}