@voxgig/apidef 2.2.0 → 2.3.0

package/src/transform.ts

@@ -79,126 +79,6 @@ const GuideShape = Gubu({
 type Guide = ReturnType<typeof GuideShape>
 
 
-/*
-async function resolveTransforms(ctx: TransformCtx): Promise<TransformSpec> {
-  const { log, model: { main: { api: { guide } } } } = ctx
-
-  const tspec: TransformSpec = {
-    transform: []
-  }
-
-  // TODO: parameterize
-  const defkind = 'openapi'
-  const transformNames = guide.control.transform[defkind].order
-    .split(/\s*,\s* /)
-    .map((t: string) => t.trim())
-  .filter((t: string) => '' != t)
-
-log.info({
-  point: 'transform', note: 'order: ' + transformNames.join(';'),
-  order: transformNames
-})
-
-try {
-  for (const tn of transformNames) {
-    log.debug({ what: 'transform', transform: tn, note: tn })
-    const transform = await resolveTransform(tn, ctx)
-    tspec.transform.push(transform)
-  }
-}
-catch (err: any) {
-  throw err
-}
-
-return tspec
-}
-
-
-async function resolveTransform(tn: string, ctx: TransformCtx) {
-  const { log, defpath, model: { main: { api: { guide } } } } = ctx
-
-  let transform = TRANSFORM[tn]
-  if (transform) {
-    return transform
-  }
-
-  const tdef = guide.transform[tn]
-  if (null == tdef) {
-    const err = new Error('Unknown transform: ' + tn)
-    log.error({ what: 'transform', transform: tn, fail: 'unknown', err })
-    throw err
-  }
-
-  if (!tn.startsWith('custom')) {
-    const err =
-      new Error('Custom transform name must start with "custom": ' + tn)
-    log.error({ what: 'transform', transform: tn, fail: 'prefix', err })
-    throw err
-  }
-
-  const customtpath = Path.join(defpath, tdef.load)
-  try {
-    const transformModule = require(customtpath)
-    transform = transformModule[tn]
-  }
-  catch (e: any) {
-    const err = new Error('Custom transform not found: ' +
-      customtpath + ': ' + e.message)
-    log.error({ what: 'transform', transform: tn, fail: 'require', err })
-    throw err
-  }
-
-  return transform
-}
-
-
-async function processTransforms(
-  ctx: TransformCtx,
-  // spec: TransformSpec,
-  transforms: any[],
-  apimodel: any,
-  def: any
-): Promise<ProcessResult> {
-  const pres: ProcessResult = {
-    ok: true,
-    msg: '',
-    results: []
-  }
-
-  const guide: Guide = GuideShape(ctx.model.main.api.guide)
-
-
-  // for (let tI = 0; tI < spec.transform.length; tI++) {
-  //  const transform = spec.transform[tI]
-
-  for (let tI = 0; tI < transforms.length; tI++) {
-    const transform = transforms[tI]
-
-    try {
-      const tres = await transform(ctx, guide, apimodel, def)
-      pres.ok = pres.ok && tres.ok
-      pres.results.push(tres)
-    }
-    catch (err: any) {
-      // TODO: fix: this error does not get printed
-      console.error(err)
-
-      pres.ok = false
-      pres.msg += transform.name + ': ' + err.message + '\n'
-      pres.results.push({
-        ok: false,
-        msg: err.message,
-        err,
-        transform
-      })
-    }
-  }
-
-  return pres
-}
-*/
-
-
 
 function fixName(base: any, name: string, prop = 'name') {
   if (null != base && 'object' === typeof base && 'string' === typeof name) {

package/src/types.ts

@@ -49,6 +49,8 @@ const BuildShape = Gubu({
     require: '',
     log: {},
     fs: Any(),
+    dryrun: false,
+    buildargs: {},
     watch: {
       mod: true,
       add: true,

package/src/utility.ts

@@ -118,6 +118,12 @@ function depluralize(word: string): string {
     return word.slice(0, -2)
   }
 
+  // Handle words ending in -nses (like responses, expenses, licenses)
+  // These should only lose the final -s, not -es
+  if (word.endsWith('nses')) {
+    return word.slice(0, -1)
+  }
+  
   // -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')) {