@voxgig/apidef 2.0.2 → 2.2.0

package/dist/utility.js

@@ -1,8 +1,25 @@
 "use strict";
+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');
@@ -26,32 +43,43 @@ function depluralize(word) {
     }
     // Common irregular plurals
     const irregulars = {
+        'analyses': 'analysis',
+        'appendices': 'appendix',
+        'axes': 'axis',
         'children': 'child',
-        'men': 'man',
-        'women': 'woman',
-        'teeth': 'tooth',
+        'courses': 'course',
+        'crises': 'crisis',
+        'criteria': 'criterion',
+        'data': 'datum',
+        'diagnoses': 'diagnosis',
         'feet': 'foot',
+        'furnace': 'furnaces',
         'geese': 'goose',
-        'mice': 'mouse',
-        'people': 'person',
-        'data': 'datum',
-        'criteria': 'criterion',
-        'phenomena': 'phenomenon',
+        'horses': 'horse',
+        'house': 'houses',
         'indices': 'index',
+        'license': 'licenses',
         'matrices': 'matrix',
-        'vertices': 'vertex',
-        'analyses': 'analysis',
-        'axes': 'axis',
-        'crises': 'crisis',
-        'diagnoses': 'diagnosis',
+        'men': 'man',
+        'mice': 'mouse',
+        'notice': 'notices',
         'oases': 'oasis',
+        'people': 'person',
+        'phenomena': 'phenomenon',
+        'practice': 'practices',
+        'promise': 'promises',
+        'teeth': 'tooth',
         'theses': 'thesis',
-        'appendices': 'appendix'
+        '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';

package/dist/utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"utility.js","sourceRoot":"","sources":["../src/utility.ts"],"names":[],"mappings":"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"}
+{"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.2",
+  "version": "2.2.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.12",
+    "@types/node": "24.1.0",
     "aontu": "^0.28.0",
-    "esbuild": "^0.25.6",
     "json-schema-to-ts": "^3.1.1",
-    "memfs": "^4.17.2",
+    "memfs": "^4.25.1",
     "patch-package": "^8.0.0",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@redocly/openapi-core": "^1.34.3",
-    "@voxgig/struct": "^0.0.4",
-    "@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.24.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,7 +28,8 @@ import {
 
 
 import {
-  parse
+  parse,
+  rewrite,
 } from './parse'
 
 
@@ -44,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)
@@ -68,6 +74,7 @@ function ApiDef(opts: ApiDefOptions) {
 
   async function generate(spec: any) {
     const start = Date.now()
+    // dlog('start')
 
     const model: Model = OpenModelShape(spec.model)
     const build: Build = OpenBuildShape(spec.build)
@@ -110,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)
 
 
@@ -122,6 +135,7 @@ function ApiDef(opts: ApiDefOptions) {
       entity: entityTransform,
       operation: operationTransform,
       field: fieldTransform,
+      clean: cleanTransform,
     })
 
     const builders = await resolveElements(ctx, 'builder', 'standard', {
@@ -155,6 +169,13 @@ function ApiDef(opts: ApiDefOptions) {
       existing: { txt: { merge: true } }
     }, root)
 
+    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 })
 
     return {

package/src/guide/heuristic01.ts

@@ -2,8 +2,13 @@
 
 import { each, snakify, names } from 'jostraca'
 
+import { size } from '@voxgig/struct'
 
-import { depluralize } from '../utility'
+
+import {
+  depluralize,
+  getdlog
+} from '../utility'
 
 
 type EntityDesc = {
@@ -19,10 +24,12 @@ type EntityPathDesc = {
   op: Record<string, any>
 }
 
+// Log non-fatal wierdness.
+const dlog = getdlog('apidef', __filename)
+
 async function heuristic01(ctx: any): Promise<Record<string, any>> {
   let guide = ctx.model.main.api.guide
 
-
   const entityDescs = resolveEntityDescs(ctx)
 
   // console.log('entityDescs')
@@ -33,10 +40,16 @@ async function heuristic01(ctx: any): Promise<Record<string, any>> {
     entity: entityDescs,
   }
 
+  // console.log('GUIDE')
+  // console.dir(guide, { depth: null })
+
   return guide
 }
 
 
+
+
+
 const METHOD_IDOP: Record<string, string> = {
   get: 'load',
   post: 'create',
@@ -51,24 +64,52 @@ function resolveEntityDescs(ctx: any) {
   const paths = ctx.def.paths
 
   // Analyze paths ending in .../foo/{foo}
-  each(paths, (pathdef, pathstr) => {
+  each(paths, (pathDef: any, pathStr: string) => {
 
     // Look for rightmmost /entname/{entid}.
-    const m = pathstr.match(/\/([a-zA-Z0-1_-]+)\/\{([a-zA-Z0-1_-]+)\}$/)
+    let m = pathStr.match(/\/([a-zA-Z0-1_-]+)(\/\{([a-zA-Z0-1_-]+)\})?$/)
+    // const m = pathStr.match(/\/([a-zA-Z0-1_-]+)\/\{([a-zA-Z0-1_-]+)\}$/)
     if (m) {
-      const entdesc = resolveEntity(entityDescs, pathstr, m[1], m[2])
+      // const entdesc = resolveEntity(entityDescs, pathStr, m[1], m[2])
 
+      each(pathDef, (methodDef: any, methodStr: string) => {
+        methodStr = methodStr.toLowerCase()
+
+
+        if (!METHOD_IDOP[methodStr]) {
+          return
+        }
+
+        const entdesc = resolveEntity(entityDescs, pathDef, pathStr, methodDef, methodStr)
+
+        if (null == entdesc) {
+          console.log(
+            'WARNING: unable to resolve entity for method ' + methodStr +
+            ' path ' + pathStr)
+          return
+        }
+
+        // if (pathStr.includes('courses')) {
+        //   console.log('ENTRES', pathStr, methodStr)
+        //   console.dir(ent2, { depth: null })
+        // }
+
+        let opname = resolveOpName(methodStr, methodDef, pathStr, entdesc)
+
+        if (null == opname) {
+          console.log(
+            'WARNING: unable to resolve operation for method ' + methodStr +
+            ' path ' + pathStr)
+          return
+        }
 
-      each(pathdef, (mdef, method) => {
-        const opname = METHOD_IDOP[method]
-        if (null == opname) return;
 
         const transform: Record<string, any> = {
           // reqform: '`reqdata`',
           // resform: '`body`',
         }
 
-        const resokdef = mdef.responses[200] || mdef.responses[201]
+        const resokdef = methodDef.responses[200] || methodDef.responses[201]
         const resbody = resokdef?.content?.['application/json']?.schema
         if (resbody) {
           if (resbody[entdesc.origname]) {
@@ -79,7 +120,7 @@ function resolveEntityDescs(ctx: any) {
           }
         }
 
-        const reqdef = mdef.requestBody?.content?.['application/json']?.schema?.properties
+        const reqdef = methodDef.requestBody?.content?.['application/json']?.schema?.properties
         if (reqdef) {
           if (reqdef[entdesc.origname]) {
             transform.reqform = { [entdesc.origname]: '`reqdata`' }
@@ -90,89 +131,252 @@ function resolveEntityDescs(ctx: any) {
 
         }
 
-        const op = entdesc.path[pathstr].op
+        const op = entdesc.path[pathStr].op
 
         op[opname] = {
           // TODO: in actual guide, remove "standard" method ops since redundant
-          method,
+          method: methodStr,
         }
 
         if (0 < Object.entries(transform).length) {
           op[opname].transform = transform
         }
+
+        if ('/v2/users/{user_id}/enrollment' === pathStr) {
+          console.log('ENT')
+          console.dir(entdesc, { depth: null })
+        }
       })
     }
   })
 
-  // Analyze paths ending in .../foo
-  each(paths, (pathdef, pathstr) => {
+  // console.log('USER')
+  // console.dir(entityDescs.user, { depth: null })
 
-    // Look for rightmmost /entname.
-    const m = pathstr.match(/\/([a-zA-Z0-1_-]+)$/)
-    if (m) {
-      const entdesc = resolveEntity(entityDescs, pathstr, m[1])
+  return entityDescs
+}
 
-      if (pathdef.get) {
-        const op: Record<string, any> = { list: { method: 'get' } }
-        entdesc.path[pathstr] = { op }
 
-        const transform: Record<string, any> = {}
-        const mdef = pathdef.get
-        const resokdef = mdef.responses[200] || mdef.responses[201]
-        const resbody = resokdef?.content?.['application/json']?.schema
-        if (resbody) {
-          if (resbody[entdesc.origname]) {
-            transform.resform = '`body.' + entdesc.origname + '`'
-          }
-          else if (resbody[entdesc.name]) {
-            transform.resform = '`body.' + entdesc.name + '`'
-          }
-        }
+function resolveEntity(
+  entityDescs: Record<string, EntityDesc>,
+  pathDef: Record<string, any>,
+  pathStr: string,
+  methodDef: Record<string, any>,
+  methodStr: string,
+): EntityDesc | undefined {
+
+  let entdesc: EntityDesc
+  let entname: string = ''
+  let origentname: string = ''
+
+  const m = pathStr.match(/\/([a-zA-Z0-1_-]+)(\/\{([a-zA-Z0-1_-]+)\})?$/)
+  if (m) {
+    let pathName = m[1]
+    origentname = snakify(pathName)
+
+    // Check schema
+    const compname = resolveComponentName(methodDef, methodStr)
+    if (compname) {
+      origentname = snakify(compname)
+    }
 
-        if (0 < Object.entries(transform).length) {
-          op.transform = transform
-        }
+    entname = depluralize(origentname)
+
+    entdesc = (entityDescs[entname] = entityDescs[entname] || {
+      name: entname,
+      id: Math.random(),
+      alias: {}
+    })
+
+    let pathParam = m[3]
+    if (null != pathParam) {
+      const pathParamCanon = snakify(pathParam)
+      if ('id' != pathParamCanon) {
+        entdesc.alias.id = pathParamCanon
+        entdesc.alias[pathParamCanon] = 'id'
       }
     }
-  })
+  }
 
-  return entityDescs
-}
+  // Can't figure out the entity
+  else {
+    console.log('NO ENTTIY', pathStr)
+    return
+  }
 
 
-function resolveEntity(
-  entityDescs: Record<string, EntityDesc>,
-  pathStr: string,
-  pathName: string,
-  pathParam?: string
-)
-  : EntityDesc {
-  let origentname = snakify(pathName)
-  let entname = depluralize(origentname)
-
-  let entdesc = (entityDescs[entname] = entityDescs[entname] || { name: entname })
-  entdesc.plural = origentname
+  // entdesc.plural = origentname
   entdesc.origname = origentname
 
   names(entdesc, entname)
 
   entdesc.alias = entdesc.alias || {}
 
-  if (null != pathParam) {
-    const pathParamCanon = snakify(pathParam)
-    if ('id' != pathParamCanon) {
-      entdesc.alias.id = pathParamCanon
-      entdesc.alias[pathParamCanon] = 'id'
+  entdesc.path = (entdesc.path || {})
+  entdesc.path[pathStr] = entdesc.path[pathStr] || {}
+  entdesc.path[pathStr].op = entdesc.path[pathStr].op || {}
+
+  return entdesc
+}
+
+
+const REQKIND: any = {
+  get: 'res',
+  post: 'req',
+  put: 'req',
+  patch: 'req',
+}
+
+
+function resolveComponentName(
+  methodDef: Record<string, any>,
+  methodStr: string,
+): string | undefined {
+  const kind = REQKIND[methodStr]
+  let compname: string | undefined = undefined
+
+  const responses = methodDef.responses
+  const schemalist =
+    [
+      methodDef.requestBody?.content,
+      responses?.['201'],
+      responses?.['200'],
+    ]
+      .filter(cmp => null != cmp)
+      .map(content => content['application/json']?.schema)
+      .filter(schema => null != schema)
+      .filter(schema => null != schema['x-ref'])
+      .map(schema => {
+        let xrefm = schema['x-ref'].match(/\/components\/schemas\/(.+)$/)
+        if (xrefm) {
+          schema['x-ref-cmp'] = xrefm[1]
+        }
+        return schema
+      })
+      .filter(schema => null != schema['x-ref-cmp'])
+
+  let schema = undefined
+  let splen = -1
+
+  for (let sI = 0; sI < schemalist.length; sI++) {
+    let nextschema = schemalist[sI]
+    let nsplen = nextschema.properties?.length || -1
+
+    // console.log('QQQ', splen, nsplen, schema?.['x-ref-cmp'], nextschema?.['x-ref-cmp'])
+
+    if (
+      // More properties probably means it is the full entity.
+      splen < nsplen ||
+
+      // Shorter name probably means it is the full entity (no suffix/prefix).
+      (schema && splen === nsplen && nextschema['x-ref-cmp'].length < schema['x-ref-cmp'].length)
+
+    ) {
+      schema = nextschema
+      splen = nsplen
     }
   }
 
-  entdesc.path = (entdesc.path || {})
-  entdesc.path[pathStr] = { op: {} }
+  if (schema) {
+    let xref = schema['x-ref']
+    // console.log('RCN-XREF', methodStr, 'xref-0', xref)
+
+    if (null == xref) {
+      const properties = schema.properties || {}
+      each(properties, (prop) => {
+        if (null == xref) {
+          if (prop.type === 'array') {
+            xref = prop.items?.['x-ref']
+            // console.log('RCN', methodStr, 'xref-1', xref)
+          }
+        }
+      })
+    }
 
-  return entdesc
+    if (null != xref && 'string' === typeof xref) {
+      let xrefm = xref.match(/\/components\/schemas\/(.+)$/)
+      if (xrefm) {
+        compname = xrefm[1]
+      }
+    }
+  }
+
+  return compname
 }
 
 
+function resolveOpName(methodStr: string, methodDef: any, pathStr: string, entdesc: EntityDesc)
+  : string | undefined {
+
+  let opname = METHOD_IDOP[methodStr]
+  if (null == opname) return;
+
+  if ('load' === opname) {
+    const islist = isListResponse(methodDef, pathStr, entdesc)
+    opname = islist ? 'list' : opname
+
+    console.log('ISLIST', entdesc.name, methodStr, opname, pathStr)
+  }
+
+  return opname
+}
+
+
+function isListResponse(
+  methodDef: Record<string, any>,
+  pathStr: string,
+  entdesc: EntityDesc
+): boolean {
+  const responses = methodDef.responses
+  const resdef = responses?.['201'] || responses?.['200']
+  const content = resdef?.content
+
+  let islist = false
+
+  if (null != content) {
+    const schema = content['application/json']?.schema
+    if (schema) {
+      if (schema.type === 'array') {
+        islist = true
+      }
+
+      if (!islist) {
+        const properties = schema.properties || {}
+        each(properties, (prop) => {
+          if (prop.type === 'array') {
+
+            if (
+              1 === size(properties) ||
+              prop.key$ === entdesc.name ||
+              prop.key$ === entdesc.origname ||
+              listedEntity(prop) === entdesc.name
+            ) {
+              islist = true
+            }
+
+            if ('/v2/users' === pathStr) {
+              console.log('islistresponse', islist, pathStr, entdesc.name, listedEntity(prop), properties)
+            }
+          }
+        })
+      }
+    }
+  }
+
+  return islist
+}
+
+
+function listedEntity(prop: any) {
+  const xref = prop?.items?.['x-ref']
+  const m = 'string' === typeof xref && xref.match(/^#\/components\/schemas\/(.+)$/)
+  if (m) {
+    return depluralize(snakify(m[1]))
+  }
+}
+
+
+
 export {
   heuristic01
 }