@voxgig/apidef 2.0.0 → 2.1.0

package/dist/types.d.ts

@@ -21,6 +21,7 @@ declare const ModelShape: {
             def: {};
             api: {
                 guide: {};
+                entity: {};
             };
         };
     };
@@ -32,6 +33,7 @@ declare const ModelShape: {
             def: {};
             api: {
                 guide: {};
+                entity: {};
             };
         };
     };
@@ -81,6 +83,7 @@ declare const ModelShape: {
             def: {};
             api: {
                 guide: {};
+                entity: {};
             };
         };
     }>;
@@ -116,6 +119,7 @@ declare const OpenModelShape: {
                 def: {};
                 api: {
                     guide: {};
+                    entity: {};
                 };
             };
         };
@@ -127,6 +131,7 @@ declare const OpenModelShape: {
                 def: {};
                 api: {
                     guide: {};
+                    entity: {};
                 };
             };
         };
@@ -176,6 +181,7 @@ declare const OpenModelShape: {
                 def: {};
                 api: {
                     guide: {};
+                    entity: {};
                 };
             };
         }>;
@@ -234,6 +240,7 @@ declare const OpenModelShape: {
                 def: {};
                 api: {
                     guide: {};
+                    entity: {};
                 };
             };
         };
@@ -245,6 +252,7 @@ declare const OpenModelShape: {
                 def: {};
                 api: {
                     guide: {};
+                    entity: {};
                 };
             };
         };
@@ -294,6 +302,7 @@ declare const OpenModelShape: {
                 def: {};
                 api: {
                     guide: {};
+                    entity: {};
                 };
             };
         }>;

package/dist/types.js

@@ -10,11 +10,12 @@ const ModelShape = (0, gubu_1.Gubu)({
         sdk: {},
         def: {},
         api: {
-            guide: {}
+            guide: {},
+            entity: {},
         },
     }
 });
-const OpenModelShape = (0, gubu_1.Gubu)((0, gubu_1.Open)(ModelShape));
+const OpenModelShape = (0, gubu_1.Gubu)((0, gubu_1.Open)(ModelShape), { name: 'Model' });
 exports.OpenModelShape = OpenModelShape;
 const BuildShape = (0, gubu_1.Gubu)({
     spec: {

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,4CAA4C;;;AAK5C,+BAAsC;AAmBtC,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,MAAM;IACX,IAAI,EAAE;QACJ,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,EAAE;QACP,GAAG,EAAE;YACH,KAAK,EAAE,EAAE;SACV;KACF;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,UAAU,CAAC,CAAC,CAAA;AAuC3C,wCAAc;AAlChB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC;IACtB,IAAI,EAAE;QACJ,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;QACR,KAAK,EAAE,EAAE;QACT,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,EAAE;QACP,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,EAAE;QACP,EAAE,EAAE,IAAA,UAAG,GAAE;QACT,KAAK,EAAE;YACL,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;SACV;KACF;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,UAAU,CAAC,CAAC,CAAA;AAkB3C,wCAAc"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,4CAA4C;;;AAK5C,+BAAsC;AAmBtC,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,MAAM;IACX,IAAI,EAAE;QACJ,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,EAAE;QACP,GAAG,EAAE;YACH,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACX;KACF;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;AAuC9D,wCAAc;AAlChB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC;IACtB,IAAI,EAAE;QACJ,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;QACR,KAAK,EAAE,EAAE;QACT,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,EAAE;QACP,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,EAAE;QACP,EAAE,EAAE,IAAA,UAAG,GAAE;QACT,KAAK,EAAE;YACL,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;SACV;KACF;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,UAAU,CAAC,CAAC,CAAA;AAkB3C,wCAAc"}

package/dist/utility.d.ts

@@ -1,4 +1,10 @@
 import type { FsUtil, Log } from './types';
+declare function getdlog(tagin?: string, filepath?: string): ((...args: any[]) => void) & {
+    tag: string;
+    file: string;
+    log: (fp?: string) => any[];
+};
 declare function loadFile(path: string, what: string, fs: FsUtil, log: Log): string;
 declare function formatJsonSrc(jsonsrc: string): string;
-export { loadFile, formatJsonSrc };
+declare function depluralize(word: string): string;
+export { getdlog, loadFile, formatJsonSrc, depluralize, };

package/dist/utility.js

@@ -3,9 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getdlog = getdlog;
 exports.loadFile = loadFile;
 exports.formatJsonSrc = formatJsonSrc;
+exports.depluralize = depluralize;
 const node_path_1 = __importDefault(require("node:path"));
+function getdlog(tagin, filepath) {
+    const tag = tagin || '-';
+    const file = node_path_1.default.basename(filepath || '-');
+    const g = global;
+    g.__dlog__ = (g.__dlog__ || []);
+    const dlog = (...args) => g.__dlog__.push([tag, file, Date.now(), ...args]);
+    dlog.tag = tag;
+    dlog.file = file;
+    dlog.log = (filepath, f) => (f = null == filepath ? null : node_path_1.default.basename(filepath),
+        g.__dlog__.filter((n) => n[0] === tag && (null == f || n[2] === f)));
+    return dlog;
+}
 function loadFile(path, what, fs, log) {
     try {
         const source = fs.readFileSync(path, 'utf8');
@@ -19,41 +33,80 @@ function loadFile(path, what, fs, log) {
 function formatJsonSrc(jsonsrc) {
     return jsonsrc
         .replace(/"([a-zA-Z_][a-zA-Z_0-9]*)": /g, '$1: ')
-        .replace(/},/g, '}\n');
+        .replace(/},/g, '}\n')
+        // .replace(/([a-zA-Z_][a-zA-Z_0-9]*)_COMMENT:/g, '# $1')
+        .replace(/\n(\s*)([a-zA-Z_][a-zA-Z_0-9]*)_COMMENT:\s*"(.*)",/g, '\n\n$1# $2 $3');
 }
-function writeChanged(point, path, content, fs, log, flags) {
-    let exists = false;
-    let changed = false;
-    flags = flags || {};
-    flags.update = null == flags.update ? true : !!flags.update;
-    let action = '';
-    try {
-        let existingContent = '';
-        path = node_path_1.default.normalize(path);
-        exists = fs.existsSync(path);
-        if (exists) {
-            action = 'read';
-            existingContent = fs.readFileSync(path, 'utf8');
-        }
-        changed = existingContent !== content;
-        action = flags.update ? 'write' : 'skip';
-        log.info({
-            point: 'write-' + point,
-            note: (changed ? '' : 'not-') + 'changed ' + path,
-            write: 'file', skip: !changed, exists, changed,
-            contentLength: content.length, file: path
-        });
-        if (!exists || (changed && flags.update)) {
-            fs.writeFileSync(path, content);
+function depluralize(word) {
+    if (!word || word.length === 0) {
+        return word;
+    }
+    // Common irregular plurals
+    const irregulars = {
+        'analyses': 'analysis',
+        'appendices': 'appendix',
+        'axes': 'axis',
+        'children': 'child',
+        'courses': 'course',
+        'crises': 'crisis',
+        'criteria': 'criterion',
+        'data': 'datum',
+        'diagnoses': 'diagnosis',
+        'feet': 'foot',
+        'furnace': 'furnaces',
+        'geese': 'goose',
+        'horses': 'horse',
+        'house': 'houses',
+        'indices': 'index',
+        'license': 'licenses',
+        'matrices': 'matrix',
+        'men': 'man',
+        'mice': 'mouse',
+        'notice': 'notices',
+        'oases': 'oasis',
+        'people': 'person',
+        'phenomena': 'phenomenon',
+        'practice': 'practices',
+        'promise': 'promises',
+        'teeth': 'tooth',
+        'theses': 'thesis',
+        'vertices': 'vertex',
+        'women': 'woman',
+    };
+    if (irregulars[word]) {
+        return irregulars[word];
+    }
+    // Rules for regular plurals (applied in order)
+    if (word.endsWith('ies') && word.length > 3) {
+        return word.slice(0, -3) + 'y';
+    }
+    // -ies -> -y (cities -> city)
+    if (word.endsWith('ies') && word.length > 3) {
+        return word.slice(0, -3) + 'y';
+    }
+    // -ves -> -f or -fe (wolves -> wolf, knives -> knife)
+    if (word.endsWith('ves')) {
+        const stem = word.slice(0, -3);
+        // Check if it should be -fe (like knife, wife, life)
+        if (['kni', 'wi', 'li'].includes(stem)) {
+            return stem + 'fe';
         }
+        return stem + 'f';
     }
-    catch (err) {
-        log.error({
-            fail: action, point, file: path, exists, changed,
-            contentLength: content.length, err
-        });
-        err.__logged__ = true;
-        throw err;
+    // -oes -> -o (potatoes -> potato)
+    if (word.endsWith('oes')) {
+        return word.slice(0, -2);
+    }
+    // -ses, -xes, -zes, -shes, -ches -> remove -es (boxes -> box)
+    if (word.endsWith('ses') || word.endsWith('xes') || word.endsWith('zes') ||
+        word.endsWith('shes') || word.endsWith('ches')) {
+        return word.slice(0, -2);
+    }
+    // -s -> remove -s (cats -> cat)
+    if (word.endsWith('s') && !word.endsWith('ss')) {
+        return word.slice(0, -1);
     }
+    // If none of the rules apply, return as is
+    return word;
 }
 //# sourceMappingURL=utility.js.map

package/dist/utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"utility.js","sourceRoot":"","sources":["../src/utility.ts"],"names":[],"mappings":";;;;;AA+EE,4BAAQ;AACR,sCAAa;AA/Ef,0DAA4B;AAS5B,SAAS,QAAQ,CAAC,IAAY,EAAE,IAAY,EAAE,EAAU,EAAE,GAAQ;IAChE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC5C,OAAO,MAAM,CAAA;IACf,CAAC;IACD,OAAO,GAAQ,EAAE,CAAC;QAChB,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;QAC5C,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC;AAGD,SAAS,aAAa,CAAC,OAAe;IACpC,OAAO,OAAO;SACX,OAAO,CAAC,+BAA+B,EAAE,MAAM,CAAC;SAChD,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC;AAGD,SAAS,YAAY,CACnB,KAAa,EAAE,IAAY,EAAE,OAAe,EAC5C,EAAU,EAAE,GAAQ,EACpB,KAA4B;IAE5B,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,IAAI,OAAO,GAAG,KAAK,CAAA;IAEnB,KAAK,GAAG,KAAK,IAAI,EAAE,CAAA;IACnB,KAAK,CAAC,MAAM,GAAG,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;IAE3D,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,CAAC;QACH,IAAI,eAAe,GAAW,EAAE,CAAA;QAChC,IAAI,GAAG,mBAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAE3B,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAE5B,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,GAAG,MAAM,CAAA;YACf,eAAe,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACjD,CAAC;QAED,OAAO,GAAG,eAAe,KAAK,OAAO,CAAA;QAErC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;QAExC,GAAG,CAAC,IAAI,CAAC;YACP,KAAK,EAAE,QAAQ,GAAG,KAAK;YACvB,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,GAAG,IAAI;YACjD,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO;YAC9C,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI;SAC1C,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YACzC,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACjC,CAAC;IACH,CAAC;IACD,OAAO,GAAQ,EAAE,CAAC;QAChB,GAAG,CAAC,KAAK,CAAC;YACR,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO;YAChD,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG;SACnC,CAAC,CAAA;QACF,GAAG,CAAC,UAAU,GAAG,IAAI,CAAA;QACrB,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC"}
+{"version":3,"file":"utility.js","sourceRoot":"","sources":["../src/utility.ts"],"names":[],"mappings":"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"}

package/model/apidef.jsonic

@@ -7,6 +7,7 @@ main: api: guide: control: {
       entity,
       operation,
       field,
+      clean,
       ` | string,
 
     element: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/apidef",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "main": "dist/apidef.js",
   "type": "commonjs",
   "types": "dist/apidef.d.ts",
@@ -41,23 +41,22 @@
   "devDependencies": {
     "@hapi/code": "^9.0.3",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "24.0.7",
+    "@types/node": "24.1.0",
     "aontu": "^0.28.0",
-    "esbuild": "^0.25.5",
     "json-schema-to-ts": "^3.1.1",
-    "memfs": "^4.17.2",
+    "memfs": "^4.24.0",
     "patch-package": "^8.0.0",
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@redocly/openapi-core": "^1.34.3",
-    "@voxgig/struct": "^0.0.3",
-    "@voxgig/util": "^0.0.10",
+    "@redocly/openapi-core": "^1.34.5",
+    "@voxgig/struct": "^0.0.6",
+    "@voxgig/util": "^0.2.0",
     "chokidar": "^4.0.3",
     "gubu": "^9.0.0",
-    "jostraca": "^0.20.0",
+    "jostraca": "^0.23.0",
     "pino": "^9.7.0",
-    "pino-pretty": "^13.0.0",
+    "pino-pretty": "^13.1.1",
     "sonic-boom": "^4.2.0"
   }
 }

package/src/apidef.ts

@@ -28,13 +28,12 @@ import {
 
 
 import {
-  parse
+  parse,
+  rewrite,
 } from './parse'
 
 
 import {
-  resolveTransforms,
-  processTransforms,
   fixName,
 } from './transform'
 
@@ -46,20 +45,25 @@ import {
 
 import {
   loadFile,
+  getdlog,
 } from './utility'
 
-
 import { topTransform } from './transform/top'
 import { entityTransform } from './transform/entity'
 import { operationTransform } from './transform/operation'
 import { fieldTransform } from './transform/field'
+import { cleanTransform } from './transform/clean'
 
 import { makeEntityBuilder } from './builder/entity'
 import { makeFlowBuilder } from './builder/flow'
 
+// Log non-fatal wierdness.
+const dlog = getdlog('apidef', __filename)
+
 
 function ApiDef(opts: ApiDefOptions) {
 
+
   // TODO: gubu opts!
   const fs = opts.fs || Fs
   const pino = prettyPino('apidef', opts)
@@ -70,9 +74,7 @@ function ApiDef(opts: ApiDefOptions) {
 
   async function generate(spec: any) {
     const start = Date.now()
-
-    // console.log('APIDEF GENERATE')
-    // console.dir(spec, { depth: null })
+    // dlog('start')
 
     const model: Model = OpenModelShape(spec.model)
     const build: Build = OpenBuildShape(spec.build)
@@ -115,9 +117,15 @@ function ApiDef(opts: ApiDefOptions) {
 
     const defsrc = loadFile(defpath, 'def', fs, log)
 
-    const def = await parse('OpenAPI', defsrc, { file: defpath })
+    let def = await parse('OpenAPI', defsrc, { file: defpath })
+
+    def = rewrite(def)
+
+    fs.writeFileSync(defpath + '.full.json', JSON.stringify(def, null, 2))
+
     ctx.def = def
 
+
     const guideBuilder = await resolveGuide(ctx)
 
 
@@ -127,38 +135,15 @@ function ApiDef(opts: ApiDefOptions) {
       entity: entityTransform,
       operation: operationTransform,
       field: fieldTransform,
+      clean: cleanTransform,
     })
 
-    // log.debug({
-    //   point: 'transform', spec: transformSpec,
-    //   note: log.levelVal <= 20 ? inspect(transformSpec) : ''
-    // })
-
-    // const processResult = await processTransforms(ctx, transforms, apimodel, def)
-
-    // if (!processResult.ok) {
-    //   log.error({
-    //     fail: 'process', point: 'transform-result',
-    //     result: processResult, note: processResult.msg,
-    //     err: processResult.results[0]?.err
-    //   })
-
-    //   return { ok: false, name: 'apidef', processResult }
-    // }
-
-
     const builders = await resolveElements(ctx, 'builder', 'standard', {
       entity: makeEntityBuilder,
       flow: makeFlowBuilder,
     })
 
 
-
-    // const entityBuilder = resolveEntity(apimodel, spec, opts)
-
-    // const entityBuilder = await resolveEntity(ctx)
-    // const flowBuilder = await resolveFlows(ctx)
-
     const jostraca = Jostraca({
       now: spec.now,
       fs: () => fs,
@@ -184,7 +169,12 @@ function ApiDef(opts: ApiDefOptions) {
       existing: { txt: { merge: true } }
     }, root)
 
-    // console.log('JRES', jres)
+    const dlogs = dlog.log()
+    if (0 < dlogs.length) {
+      for (let dlogentry of dlogs) {
+        log.debug({ point: 'generate-warning', dlogentry, note: String(dlogentry) })
+      }
+    }
 
     log.info({ point: 'generate-end', note: 'success', break: true })
 

package/src/builder/flow/flowHeuristic01.ts

@@ -24,7 +24,7 @@ function resolveBasicEntityFlow(ctx: any, entity: any) {
   const apiEntity = apimodel.main.api.entity[entity.name]
 
   const flow: any = {
-    name: 'Basic' + apiEntity.Name
+    name: 'Basic' + apiEntity.Name + 'Flow'
   }
 
   const refs = [
@@ -36,18 +36,21 @@ function resolveBasicEntityFlow(ctx: any, entity: any) {
   const idmap = refs.reduce((a: any, ref) => (a[ref] = ref.toUpperCase(), a), {})
 
   flow.model = ({
-    name: flow.Name,
+    name: flow.name,
+    active: true,
     param: {
-      [`${model.NAME}_TEST_${apiEntity.NAME}_ENTID`]: idmap
+      [`${model.NAME}_TEST_${apiEntity.NAME}_ENTID`]: idmap,
+      [`${model.NAME}_TEST_LIVE`]: "FALSE",
+      [`${model.NAME}_TEST_EXPLAIN`]: "FALSE",
     },
-    test: { entity: { [apiEntity.Name]: {} } },
+    test: { entity: { [apiEntity.name]: {} } },
     step: []
   } as any)
 
   names(flow, flow.name)
 
 
-  const data = flow.model.test.entity[apiEntity.Name]
+  const data = flow.model.test.entity[apiEntity.name]
 
   refs.map((ref, i) => {
     const id = idmap[ref]
@@ -73,7 +76,34 @@ function resolveBasicEntityFlow(ctx: any, entity: any) {
   let num = 0
   let name
 
+  const am: any = {}
+
   if (apiEntity.op.load) {
+
+    // Get additional required match properties
+    each(apiEntity.op.load.param, (param: any) => {
+      if (param.required) {
+        let ancestorName = param.name
+        let ancestorEntity = apimodel.main.api.entity[ancestorName]
+
+        if (null == ancestorEntity) {
+          ancestorName = ancestorName.replace('_id', '')
+          ancestorEntity = apimodel.main.api.entity[ancestorName]
+        }
+
+        if (ancestorEntity && ancestorName !== apiEntity.name) {
+          flow.model.param[`${model.NAME}_TEST_${ancestorEntity.NAME}_ENTID`] = {
+            [ancestorEntity.name + '01']: ancestorEntity.NAME + '01'
+          }
+          am[param.name] =
+            `\`dm$=p.${model.NAME}_TEST_${ancestorEntity.NAME}_ENTID.${ancestorEntity.name}01\``
+
+          data[`${apiEntity.NAME}01`][param.name] = ancestorEntity.NAME + '01'
+        }
+      }
+    })
+
+
     name = `load_${apiEntity.name}${num}`
     steps.push({
       name,
@@ -81,11 +111,13 @@ function resolveBasicEntityFlow(ctx: any, entity: any) {
       entity: `${apiEntity.name}`,
       action: 'load',
       match: {
-        id: `\`dm$=p.${model.NAME}_TEST_${apiEntity.NAME}_ENTID.${apiEntity.name}01\``
+        id: `\`dm$=p.${model.NAME}_TEST_${apiEntity.NAME}_ENTID.${apiEntity.name}01\``,
+        ...am,
       },
       valid: {
         '`$OPEN`': true,
-        id: `\`dm$=s.${name}.match.id\``
+        id: `\`dm$=s.${name}.match.id\``,
+        ...am,
       }
     })
   }
@@ -105,6 +137,7 @@ function resolveBasicEntityFlow(ctx: any, entity: any) {
       valid: {
         '`$OPEN`': true,
         id: `\`dm$=s.${loadref}.match.id\``,
+        ...am,
         ...valid
       }
     })
@@ -118,11 +151,13 @@ function resolveBasicEntityFlow(ctx: any, entity: any) {
       entity: `${apiEntity.name}`,
       action: 'load',
       match: {
-        id: `\`dm$=p.${model.NAME}_TEST_${apiEntity.NAME}_ENTID.${apiEntity.name}01\``
+        id: `\`dm$=p.${model.NAME}_TEST_${apiEntity.NAME}_ENTID.${apiEntity.name}01\``,
+        ...am,
       },
       valid: {
         '`$OPEN`': true,
         id: `\`dm$=s.${loadref}.match.id\``,
+        ...am,
         ...valid
       }
     })
@@ -136,7 +171,7 @@ function resolveBasicEntityFlow(ctx: any, entity: any) {
 
 function makeUpdateData(name: string, apiEntity: any, flow: any, id: string) {
   const ud: any = {}
-  const data = flow.model.test.entity[apiEntity.Name]
+  const data = flow.model.test.entity[apiEntity.name]
 
   const dataFields = each(apiEntity.field).filter(f => 'id' !== f.name && !f.name.includes('_id'))
   const stringFields = each(dataFields).filter(f => 'string' === f.type)

package/src/builder/flow.ts

@@ -21,6 +21,7 @@ async function makeFlowBuilder(ctx: any) {
     throw new Error('Unknown guide strategy: ' + ctx.opts.strategy)
   }
 
+
   return function flowBuilder() {
 
     Folder({ name: 'flow' }, () => {
@@ -32,13 +33,13 @@ async function makeFlowBuilder(ctx: any) {
         let flowfile =
           Path.join(ctx.opts.folder, 'flow',
             (null == ctx.opts.outprefix ? '' : ctx.opts.outprefix) +
-            flow.Name + 'Flow.jsonic')
+            flow.Name + '.jsonic')
 
         let flowModelSrc = formatJsonSrc(JSON.stringify(flow.model, null, 2))
 
-        let flowsrc = `# ${flow.Name}Flow
+        let flowsrc = `# ${flow.Name}
 
-main: sdk: flow: ${flow.Name}Flow:
+main: sdk: flow: ${flow.Name}:
 ` + flowModelSrc
 
         barrel.push(`@"${Path.basename(flowfile)}"`)