@voxgig/system 1.1.0 → 1.3.0

package/dist/system.d.ts

@@ -1,7 +1,7 @@
 import type { Msg } from './lib/types';
 import { Utility } from './lib/utility';
 import { MakeSrv } from './srv/make';
-import { Structure } from './lib/structure';
+import { addEntity, addSrv, addMsg, addFields, resolveModelFiles } from './lib/add';
 declare function messages(seneca: any, options: any, reload: any): void;
 declare function gubuify(params: any, Gubu: any): any;
 declare function prepare(seneca: any, require: any): void;
@@ -19,4 +19,11 @@ declare const System: {
     prepare: typeof prepare;
 };
 export type { Msg };
-export { gubuify, System, MakeSrv, Utility, Local, Live, Structure, };
+declare const Add: {
+    entity: typeof addEntity;
+    srv: typeof addSrv;
+    msg: typeof addMsg;
+    fields: typeof addFields;
+    resolveModelFiles: typeof resolveModelFiles;
+};
+export { Add, gubuify, System, MakeSrv, Utility, Local, Live, };

package/dist/system.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Structure = exports.Utility = exports.MakeSrv = exports.System = void 0;
+exports.Utility = exports.MakeSrv = exports.System = exports.Add = void 0;
 exports.gubuify = gubuify;
 exports.Local = Local;
 exports.Live = Live;
@@ -14,8 +14,7 @@ const utility_1 = require("./lib/utility");
 Object.defineProperty(exports, "Utility", { enumerable: true, get: function () { return utility_1.Utility; } });
 const make_1 = require("./srv/make");
 Object.defineProperty(exports, "MakeSrv", { enumerable: true, get: function () { return make_1.MakeSrv; } });
-const structure_1 = require("./lib/structure");
-Object.defineProperty(exports, "Structure", { enumerable: true, get: function () { return structure_1.Structure; } });
+const add_1 = require("./lib/add");
 const { srvmsgs, deep } = utility_1.Utility;
 function messages(seneca, options, reload) {
     let srvname = seneca.fixedargs.plugin$.name.replace(/^srv_/, '');
@@ -37,11 +36,28 @@ function gubuify(params, Gubu) {
     if (null == params) {
         return params;
     }
+    return Gubu(gubuify_spec(params, Gubu));
+}
+// Convert model param values into a gubu spec. The '$$': 'Open' marker
+// (same convention as entity valid) makes an object open: additional
+// properties are allowed. Without it gubu objects are closed, which made
+// open message params inexpressible in the model. Nested specs stay raw
+// (builder results, not Gubu instances) so attributes like openness
+// compose into the parent shape.
+function gubuify_spec(params, Gubu) {
+    if (null == params) {
+        return params;
+    }
+    let open = false;
+    if ('Open' === params['$$']) {
+        open = true;
+        delete params['$$'];
+    }
     for (let pn in params) {
         let m = null;
         let pv = params[pn];
         if ('object' === typeof pv) {
-            params[pn] = gubuify(pv, Gubu);
+            params[pn] = gubuify_spec(pv, Gubu);
         }
         else if ('string' === typeof pv &&
             -1 === pn.indexOf(':') && ('function' === typeof Gubu[(m = ((pv.match(/\s*([A-Z]\w+)([(.\s]|$)/) || []))[1])] ||
@@ -50,11 +66,8 @@ function gubuify(params, Gubu) {
             params[png] = pv;
             delete params[pn];
         }
-        else {
-            params[pn] = Gubu(pv);
-        }
     }
-    return Gubu(params);
+    return open ? Gubu.Open(params) : params;
 }
 function actpath(msg) {
     if (msg.meta.file) {
@@ -134,4 +147,12 @@ const System = {
     prepare,
 };
 exports.System = System;
+const Add = {
+    entity: add_1.addEntity,
+    srv: add_1.addSrv,
+    msg: add_1.addMsg,
+    fields: add_1.addFields,
+    resolveModelFiles: add_1.resolveModelFiles,
+};
+exports.Add = Add;
 //# sourceMappingURL=system.js.map

package/dist/system.js.map

@@ -1 +1 @@
-{"version":3,"file":"system.js","sourceRoot":"","sources":["../system.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"system.js","sourceRoot":"","sources":["../system.ts"],"names":[],"mappings":"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"}

package/lib/add.ts

@@ -0,0 +1,381 @@
+/* Copyright © 2026 Voxgig Ltd, MIT License. */
+
+// Add elements (entity, srv, msg, field) to a Voxgig system project by
+// appending jsonic blocks to the project's model source files. Appending
+// works because aontu unifies repeated paths, and it preserves the user's
+// existing formatting and comments.
+//
+// Each add* function takes either a String(name) - an empty element of
+// that name is added - or a Jsonic(spec) - a jsonic definition of the
+// element with config options.
+
+import Fs from 'node:fs'
+import Path from 'node:path'
+
+import { Jsonic } from '@jsonic/jsonic-next'
+
+
+// Values emitted bare (aontu type/token names); everything else is quoted.
+const BARE_TOKENS = ['String', 'Number', 'Boolean', 'Skip']
+
+
+export type ModelFiles = {
+  folder: string       // the model folder
+  model: string        // model.jsonic path
+  ent: string          // entity file path
+  msg: string          // message file path
+  srv: string          // service file path
+}
+
+export type AddResult = {
+  file: string         // file appended to
+  text: string         // the appended block
+}
+
+
+// Locate the model folder from a starting folder: <start>/model,
+// <start>/backend/model, or <start> itself if it holds model.jsonic.
+function resolveModelFolder(start: string): string {
+  const candidates = [
+    start,
+    Path.join(start, 'model'),
+    Path.join(start, 'backend', 'model'),
+  ]
+  for (const c of candidates) {
+    if (Fs.existsSync(Path.join(c, 'model.jsonic'))) {
+      return c
+    }
+  }
+  throw new Error('model folder not found (looked for model.jsonic in ' +
+    candidates.join(', ') + ')')
+}
+
+
+// Resolve the entity/message/service source files from the @"file" refs
+// in model.jsonic (main: ent: @"..."), falling back to conventional names.
+function resolveModelFiles(start: string): ModelFiles {
+  const folder = resolveModelFolder(start)
+  const model = Path.join(folder, 'model.jsonic')
+  const src = Fs.readFileSync(model, 'utf8')
+
+  const ref = (key: string, fallback: string) => {
+    const m = src.match(
+      new RegExp('main:\\s*' + key + ':\\s*@"([^"]+)"'))
+    return Path.join(folder, m ? m[1] : fallback)
+  }
+
+  return {
+    folder,
+    model,
+    ent: ref('ent', 'ent.jsonic'),
+    msg: ref('msg', 'msg.jsonic'),
+    srv: ref('srv', 'srv.jsonic'),
+  }
+}
+
+
+// Format a value as jsonic source. Objects use multiline path-free style;
+// known aontu tokens (String, Skip, ...) are emitted bare.
+function fmt(val: any, depth: number): string {
+  const pad = '  '.repeat(depth)
+  const padIn = '  '.repeat(depth + 1)
+
+  if (null == val) {
+    return 'null'
+  }
+  else if ('string' === typeof val) {
+    return BARE_TOKENS.includes(val) ? val :
+      "'" + val.replace(/'/g, "\\'") + "'"
+  }
+  else if ('object' !== typeof val) {
+    return String(val)
+  }
+  else if (Array.isArray(val)) {
+    return '[' + val.map((v) => fmt(v, depth + 1)).join(', ') + ']'
+  }
+
+  const entries = Object.entries(val)
+  if (0 === entries.length) {
+    return '{}'
+  }
+
+  return '{\n' +
+    entries.map(([k, v]) => padIn + fmtKey(k) + ': ' + fmt(v, depth + 1))
+      .join('\n') +
+    '\n' + pad + '}'
+}
+
+function fmtKey(k: string): string {
+  return /^[A-Za-z_][A-Za-z0-9_]*$/.test(k) ? k :
+    "'" + k.replace(/'/g, "\\'") + "'"
+}
+
+
+function append(file: string, text: string): AddResult {
+  const existing = Fs.readFileSync(file, 'utf8')
+  const sep = existing.endsWith('\n') ? '\n' : '\n\n'
+  Fs.appendFileSync(file, sep + text + '\n')
+  return { file, text }
+}
+
+
+// Parse a name-or-spec argument. Returns { name, def } where def is the
+// element definition object ({} for the plain-name form).
+function parseArg(arg: string, kind: string): { name: string, def: any } {
+  let parsed: any
+  try {
+    parsed = Jsonic(arg)
+  }
+  catch (e: any) {
+    throw new Error('invalid ' + kind + ' argument (jsonic parse failed): ' +
+      arg + ' - ' + e.message)
+  }
+
+  if ('string' === typeof parsed) {
+    return { name: parsed, def: {} }
+  }
+
+  if (null != parsed && 'object' === typeof parsed && !Array.isArray(parsed)) {
+    // { name: 'foo', ...def }
+    if ('string' === typeof parsed.name) {
+      const def = { ...parsed }
+      delete def.name
+      return { name: parsed.name, def }
+    }
+
+    // { foo: {...def} } - single-key form
+    const keys = Object.keys(parsed)
+    if (1 === keys.length && 'object' === typeof parsed[keys[0]]) {
+      return { name: keys[0], def: parsed[keys[0]] }
+    }
+  }
+
+  throw new Error('invalid ' + kind + ' argument: ' + arg +
+    ' - provide a name, {name:...,...spec}, or {thename:{...spec}}')
+}
+
+
+// Default zone for entities: the single non-sys zone shape spread already
+// in the entity file (`<zone>: &: ...`), else 'app'.
+function defaultZone(entFile: string): string {
+  const src = Fs.readFileSync(entFile, 'utf8')
+  const zones = [...src.matchAll(/^([a-z][a-z0-9_]*):\s*&:/mg)]
+    .map((m) => m[1])
+    .filter((z) => 'sys' !== z)
+  const uniq = [...new Set(zones)]
+  return 1 === uniq.length ? uniq[0] : 'app'
+}
+
+
+// add entity [String(name)|Jsonic(spec)]
+// Names may be zone-qualified: app/thing. Spec: { name, zone?, ...def }.
+function addEntity(start: string, arg: string): AddResult {
+  const files = resolveModelFiles(start)
+  const { name: rawname, def } = parseArg(arg, 'entity')
+
+  let zone = def.zone
+  delete def.zone
+  let name = rawname
+  if (rawname.includes('/')) {
+    const parts = rawname.split('/')
+    zone = parts[0]
+    name = parts[1]
+  }
+  zone = zone || defaultZone(files.ent)
+
+  if (null == def.field) {
+    def.field = {}
+  }
+  if (null == def.valid) {
+    def.valid = { '$$': 'Open' }
+  }
+
+  const src = Fs.readFileSync(files.ent, 'utf8')
+  const shapeLine = new RegExp('^' + zone + ':\\s*&:', 'm').test(src) ? '' :
+    zone + ': &: $.main.shape.ent\n\n'
+
+  const text = '\n' + shapeLine +
+    zone + ': ' + name + ': ' + fmt(def, 0)
+
+  return append(files.ent, text)
+}
+
+
+// add srv [String(name)|Jsonic(spec)]
+// The plain-name form wires the service to its aim messages and a private
+// web area (matching the standard project scaffold).
+function addSrv(start: string, arg: string): AddResult {
+  const files = resolveModelFiles(start)
+  const { name, def } = parseArg(arg, 'srv')
+
+  if (null == def.in) {
+    def.in = {
+      aim: { [name]: {} },
+    }
+  }
+  if (null == def.user) {
+    def.user = { required: true }
+  }
+  if (null == def.api) {
+    def.api = { web: { path: { area: 'private/', suffix: '' } } }
+  }
+  if (null == def.env) {
+    def.env = { lambda: { active: true } }
+  }
+
+  const text = '\n' + name + ': ' + fmt(def, 0)
+
+  return append(files.srv, text)
+}
+
+
+// add msg [String(name)|Jsonic(spec)]
+// Name form: a message path like thing.save.item (or thing:save:item);
+// 'aim' is prepended if missing. Spec: { name: 'thing.save.item', ...meta }
+// where meta (params, transport, file, ...) lands under the '$' key.
+function addMsg(start: string, arg: string): AddResult {
+  const files = resolveModelFiles(start)
+
+  // A pure message path (thing.save.item, aim:thing:save:item) is taken
+  // as-is - jsonic would otherwise parse the colon form as a nested map.
+  const pathform = /^[a-z0-9_-]+([.:/][a-z0-9_-]+)+$/i.test(arg.trim())
+
+  let parsed: any
+  try {
+    parsed = pathform ? arg.trim() : Jsonic(arg)
+  }
+  catch (e: any) {
+    throw new Error('invalid msg argument (jsonic parse failed): ' +
+      arg + ' - ' + e.message)
+  }
+
+  let path: string[]
+  let meta: any = {}
+
+  if ('string' === typeof parsed) {
+    path = parsed.split(/[.:/]/).filter((p) => '' !== p)
+  }
+  else if (null != parsed && 'string' === typeof parsed.name) {
+    path = parsed.name.split(/[.:/]/).filter((p: string) => '' !== p)
+    meta = { ...parsed }
+    delete meta.name
+  }
+  else {
+    throw new Error('invalid msg argument: ' + arg +
+    " - provide a message path like thing.save.item, or {name:'path',...meta}")
+  }
+
+  if ('aim' !== path[0]) {
+    path.unshift('aim')
+  }
+  if (path.length < 2) {
+    throw new Error('invalid msg path: ' + path.join('.'))
+  }
+
+  const prefix = path.join(': ')
+  const text = 0 === Object.keys(meta).length ?
+    '\n' + prefix + ': {}' :
+    '\n' + prefix + ": '$': " + fmt(meta, 0)
+
+  return append(files.msg, text)
+}
+
+
+// add field <entity> [String(name)|Jsonic(spec)] ...
+// Field forms: title | title:String | title:{kind:String,valid:'Min(1)'}
+//            | {name:title,kind:String}
+// A label is derived from the name when not given.
+function addFields(start: string, entref: string, fieldargs: string[])
+  : AddResult[] {
+  const files = resolveModelFiles(start)
+
+  let zone: string
+  let name: string
+  if (entref.includes('/')) {
+    [zone, name] = entref.split('/')
+  }
+  else {
+    zone = defaultZone(files.ent)
+    name = entref
+  }
+
+  if (0 === fieldargs.length) {
+    throw new Error('no fields given')
+  }
+
+  const out: AddResult[] = []
+
+  for (const arg of fieldargs) {
+    let parsed: any
+    try {
+      parsed = Jsonic(arg)
+    }
+    catch (e: any) {
+      throw new Error('invalid field argument (jsonic parse failed): ' +
+        arg + ' - ' + e.message)
+    }
+
+    let fname: string
+    let def: any
+
+    if ('string' === typeof parsed) {
+      fname = parsed
+      def = {}
+    }
+    else if (null != parsed && 'object' === typeof parsed) {
+      if ('string' === typeof parsed.name) {
+        fname = parsed.name
+        def = { ...parsed }
+        delete def.name
+      }
+      else {
+        const keys = Object.keys(parsed)
+        if (1 !== keys.length) {
+          throw new Error('invalid field argument: ' + arg)
+        }
+        fname = keys[0]
+        const val = parsed[fname]
+        def = 'string' === typeof val ? { kind: val } : { ...val }
+      }
+    }
+    else {
+      throw new Error('invalid field argument: ' + arg)
+    }
+
+    if (null == def.kind) {
+      def.kind = 'String'
+    }
+    if (null == def.label) {
+      def.label = fname
+        .split('_')
+        .map((p: string) => '' === p ? p : p[0].toUpperCase() + p.substring(1))
+        .join(' ')
+    }
+
+    // Emit label before kind, matching scaffold convention.
+    const ordered: any = { label: def.label, kind: def.kind }
+    for (const k of Object.keys(def)) {
+      if ('label' !== k && 'kind' !== k) {
+        ordered[k] = def[k]
+      }
+    }
+
+    const text = '\n' + zone + ': ' + name + ': field: ' + fname + ': ' +
+      fmt(ordered, 0)
+
+    out.push(append(files.ent, text))
+  }
+
+  return out
+}
+
+
+export {
+  resolveModelFolder,
+  resolveModelFiles,
+  addEntity,
+  addSrv,
+  addMsg,
+  addFields,
+  fmt,
+}

package/lib/utility.ts

@@ -76,7 +76,7 @@ function walkmsgs(
 const Utility = {
   srvmsgs,
   listmsgs,
-  deep: util.deep,
+  deep: util.deep as (base?: any, ...rest: any[]) => any,
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/system",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "main": "dist/system.js",
   "type": "commonjs",
   "types": "dist/system.d.ts",
@@ -25,29 +25,40 @@
     "reset": "npm run clean && npm i && npm run build && npm test",
     "repo-tag": "REPO_VERSION=`node -e \"console.log(require('./package').version)\"` && echo TAG: v$REPO_VERSION && git commit -a -m v$REPO_VERSION && git push && git tag v$REPO_VERSION && git push --tags;",
     "repo-publish": "npm run clean && npm i && npm run repo-publish-quick",
-    "repo-publish-quick": "npm run build && npm run test && npm run repo-tag && npm publish --registry https://registry.npmjs.org --access=public"
+    "repo-publish-quick": "npm run build && npm run test && npm run repo-tag && npm run repo-stage-publish",
+    "repo-stage-publish": "aql vault exec --for=npm vxg:pub01 -- npm stage publish --registry https://registry.npmjs.org --access=public",
+    "repo-stage-publish-dry": "aql vault exec --dry-run --for=npm vxg:pub01 -- npm stage publish --registry https://registry.npmjs.org --access=public --dry-run",
+    "repo-stage-list": "aql vault exec --for=npm vxg:pub01 -- npm stage list",
+    "repo-stage-view": "aql vault exec --for=npm vxg:pub01 -- npm stage view",
+    "repo-stage-approve": "aql vault exec --for=npm vxg:pub01 -- npm stage approve",
+    "repo-stage-reject": "aql vault exec --for=npm vxg:pub01 -- npm stage reject"
   },
   "license": "MIT",
   "files": [
     "system.ts",
+    "cmd.ts",
     "lib",
     "srv",
     "dist",
     "LICENSE"
   ],
   "devDependencies": {
-    "@types/jest": "^29.5.12",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^22.20.1",
     "es-jest": "^2.1.0",
-    "esbuild": "^0.23.0",
-    "gubu": "^8.0.2",
-    "jest": "^29.7.0",
-    "typescript": "^5.5.3"
+    "esbuild": "^0.28.1",
+    "gubu": "^9.0.0",
+    "jest": "^30.4.2",
+    "typescript": "^7.0.2"
   },
   "peerDependencies": {
     "@voxgig/model": ">=2"
   },
   "dependencies": {
-    "@jsonic/jsonic-next": "^2.12.1",
-    "patrun": "^7.2.5"
+    "@jsonic/jsonic-next": "^2.14.0",
+    "patrun": "^7.3.0"
+  },
+  "bin": {
+    "voxgig-system": "dist/cmd.js"
   }
 }

package/system.ts

@@ -13,7 +13,8 @@ import { Utility } from './lib/utility'
 
 import { MakeSrv } from './srv/make'
 
-import { Structure } from './lib/structure'
+import { addEntity, addSrv, addMsg, addFields, resolveModelFiles } from './lib/add'
+
 
 
 const { srvmsgs, deep } = Utility
@@ -46,12 +47,32 @@ function gubuify(params: any, Gubu: any) {
   if (null == params) {
     return params
   }
+  return Gubu(gubuify_spec(params, Gubu))
+}
+
+
+// Convert model param values into a gubu spec. The '$$': 'Open' marker
+// (same convention as entity valid) makes an object open: additional
+// properties are allowed. Without it gubu objects are closed, which made
+// open message params inexpressible in the model. Nested specs stay raw
+// (builder results, not Gubu instances) so attributes like openness
+// compose into the parent shape.
+function gubuify_spec(params: any, Gubu: any): any {
+  if (null == params) {
+    return params
+  }
+
+  let open = false
+  if ('Open' === params['$$']) {
+    open = true
+    delete params['$$']
+  }
 
   for (let pn in params) {
     let m = null
     let pv = params[pn]
     if ('object' === typeof pv) {
-      params[pn] = gubuify(pv, Gubu)
+      params[pn] = gubuify_spec(pv, Gubu)
     }
     else if (
       'string' === typeof pv &&
@@ -64,11 +85,8 @@ function gubuify(params: any, Gubu: any) {
       params[png] = pv
       delete params[pn]
     }
-    else {
-      params[pn] = Gubu(pv)
-    }
   }
-  return Gubu(params)
+  return open ? Gubu.Open(params) : params
 }
 
 
@@ -198,12 +216,20 @@ export type {
   Msg
 }
 
+const Add = {
+  entity: addEntity,
+  srv: addSrv,
+  msg: addMsg,
+  fields: addFields,
+  resolveModelFiles,
+}
+
 export {
+  Add,
   gubuify,
   System,
   MakeSrv,
   Utility,
   Local,
   Live,
-  Structure,
 }