@rvoh/psychic 1.13.0 → 1.14.0-beta.1

package/dist/cjs/src/generate/helpers/generateControllerContent.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateControllerContent;
 const dream_1 = require("@rvoh/dream");
 const pluralize_esm_1 = __importDefault(require("pluralize-esm"));
-const relativePsychicPath_js_1 = __importDefault(require("../../helpers/path/relativePsychicPath.js"));
 function generateControllerContent({ ancestorName, ancestorImportStatement, fullyQualifiedControllerName, fullyQualifiedModelName, actions = [], omitOpenApi = false, owningModel, forAdmin, singular, }) {
     fullyQualifiedControllerName = (0, dream_1.standardizeFullyQualifiedModelName)(fullyQualifiedControllerName);
     const additionalImports = [];
@@ -23,7 +22,7 @@ function generateControllerContent({ ancestorName, ancestorImportStatement, full
         modelClassName = (0, dream_1.globalClassNameFromFullyQualifiedModelName)(fullyQualifiedModelName);
         modelAttributeName = (0, dream_1.camelize)(modelClassName);
         pluralizedModelAttributeName = singular ? modelAttributeName : (0, pluralize_esm_1.default)(modelAttributeName);
-        additionalImports.push(importStatementForModel(fullyQualifiedControllerName, fullyQualifiedModelName));
+        additionalImports.push(importStatementForModel(fullyQualifiedModelName));
     }
     const defaultOpenapiSerializerKeyProperty = forAdmin
         ? `
@@ -197,8 +196,8 @@ function loadModelStatement(forAdmin, modelClassName, loadQueryBase, singular) {
     //   ${singular ? '.firstOrFail()' : ".findOrFail(this.castParam('id', 'string'))"}
   }`;
 }
-function importStatementForModel(originControllerName, destinationModelName) {
-    return `import ${(0, dream_1.globalClassNameFromFullyQualifiedModelName)(destinationModelName)} from '${(0, relativePsychicPath_js_1.default)('controllers', 'models', originControllerName, destinationModelName)}'`;
+function importStatementForModel(destinationModelName) {
+    return `import ${(0, dream_1.globalClassNameFromFullyQualifiedModelName)(destinationModelName)} from '${(0, dream_1.absoluteDreamPath)('models', destinationModelName)}'`;
 }
 function aOrAnDreamModelName(dreamName) {
     if (/^[aeiou]/.test(dreamName))

package/dist/cjs/src/generate/helpers/generateResourceControllerSpecContent.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateResourceControllerSpecContent;
 const dream_1 = require("@rvoh/dream");
 const addImportSuffix_js_1 = __importDefault(require("../../helpers/path/addImportSuffix.js"));
-const relativePsychicPath_js_1 = __importDefault(require("../../helpers/path/relativePsychicPath.js"));
-const updirsFromPath_js_1 = __importDefault(require("../../helpers/path/updirsFromPath.js"));
 const index_js_1 = require("../../index.js");
 function generateResourceControllerSpecContent({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, owningModel, forAdmin, singular, actions, }) {
     fullyQualifiedModelName = (0, dream_1.standardizeFullyQualifiedModelName)(fullyQualifiedModelName);
@@ -23,14 +21,13 @@ function generateResourceControllerSpecContent({ fullyQualifiedControllerName, r
     const owningModelVariableName = owningModelName ? (0, dream_1.camelize)(owningModelName) : userVariableName;
     const dreamImports = [];
     const importStatements = (0, dream_1.compact)([
-        importStatementForModel(fullyQualifiedControllerName, fullyQualifiedModelName),
-        importStatementForModel(fullyQualifiedControllerName, userModelName),
-        owningModel ? importStatementForModel(fullyQualifiedControllerName, owningModel) : undefined,
-        importStatementForModelFactory(fullyQualifiedControllerName, fullyQualifiedModelName),
-        importStatementForModelFactory(fullyQualifiedControllerName, userModelName),
-        owningModel ? importStatementForModelFactory(fullyQualifiedControllerName, owningModel) : undefined,
+        importStatementForModel(fullyQualifiedModelName),
+        importStatementForModel(userModelName),
+        owningModel ? importStatementForModel(owningModel) : undefined,
+        importStatementForModelFactory(fullyQualifiedModelName),
+        importStatementForModelFactory(userModelName),
+        owningModel ? importStatementForModelFactory(owningModel) : undefined,
     ]);
-    const specUnitUpdirs = (0, updirsFromPath_js_1.default)(fullyQualifiedControllerName);
     const attributeCreationKeyValues = [];
     const attributeUpdateKeyValues = [];
     const comparableOriginalAttributeKeyValues = [];
@@ -132,7 +129,7 @@ function generateResourceControllerSpecContent({ fullyQualifiedControllerName, r
     const omitUpdate = !actions.includes('update');
     const omitDestroy = !actions.includes('destroy');
     return `${dreamImports.length ? `import { ${(0, dream_1.uniq)(dreamImports).join(', ')} } from '@rvoh/dream'\n` : ''}${(0, dream_1.uniq)(importStatements).join('\n')}
-import { RequestBody, session, SpecRequestType } from '${specUnitUpdirs}helpers/${(0, addImportSuffix_js_1.default)('authentication.js')}'
+import { RequestBody, session, SpecRequestType } from '@spec/helpers/${(0, addImportSuffix_js_1.default)('authentication.js')}'
 
 describe('${fullyQualifiedControllerName}', () => {
   let request: SpecRequestType
@@ -346,11 +343,11 @@ describe('${fullyQualifiedControllerName}', () => {
 })
 `;
 }
-function importStatementForModel(originModelName, destinationModelName = originModelName) {
-    return `import ${(0, dream_1.globalClassNameFromFullyQualifiedModelName)(destinationModelName)} from '${(0, relativePsychicPath_js_1.default)('controllerSpecs', 'models', originModelName, destinationModelName)}'`;
+function importStatementForModel(destinationModelName) {
+    return `import ${(0, dream_1.globalClassNameFromFullyQualifiedModelName)(destinationModelName)} from '${(0, dream_1.absoluteDreamPath)('models', destinationModelName)}'`;
 }
-function importStatementForModelFactory(originModelName, destinationModelName = originModelName) {
-    return `import create${(0, dream_1.globalClassNameFromFullyQualifiedModelName)(destinationModelName)} from '${(0, relativePsychicPath_js_1.default)('controllerSpecs', 'factories', originModelName, destinationModelName)}'`;
+function importStatementForModelFactory(destinationModelName) {
+    return `import create${(0, dream_1.globalClassNameFromFullyQualifiedModelName)(destinationModelName)} from '${(0, dream_1.absoluteDreamPath)('factories', destinationModelName)}'`;
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function jsonify(val) {

package/dist/esm/src/generate/helpers/generateControllerContent.js

@@ -1,6 +1,5 @@
-import { camelize, globalClassNameFromFullyQualifiedModelName, hyphenize, standardizeFullyQualifiedModelName, } from '@rvoh/dream';
+import { absoluteDreamPath, camelize, globalClassNameFromFullyQualifiedModelName, hyphenize, standardizeFullyQualifiedModelName, } from '@rvoh/dream';
 import pluralize from 'pluralize-esm';
-import relativePsychicPath from '../../helpers/path/relativePsychicPath.js';
 export default function generateControllerContent({ ancestorName, ancestorImportStatement, fullyQualifiedControllerName, fullyQualifiedModelName, actions = [], omitOpenApi = false, owningModel, forAdmin, singular, }) {
     fullyQualifiedControllerName = standardizeFullyQualifiedModelName(fullyQualifiedControllerName);
     const additionalImports = [];
@@ -17,7 +16,7 @@ export default function generateControllerContent({ ancestorName, ancestorImport
         modelClassName = globalClassNameFromFullyQualifiedModelName(fullyQualifiedModelName);
         modelAttributeName = camelize(modelClassName);
         pluralizedModelAttributeName = singular ? modelAttributeName : pluralize(modelAttributeName);
-        additionalImports.push(importStatementForModel(fullyQualifiedControllerName, fullyQualifiedModelName));
+        additionalImports.push(importStatementForModel(fullyQualifiedModelName));
     }
     const defaultOpenapiSerializerKeyProperty = forAdmin
         ? `
@@ -191,8 +190,8 @@ function loadModelStatement(forAdmin, modelClassName, loadQueryBase, singular) {
     //   ${singular ? '.firstOrFail()' : ".findOrFail(this.castParam('id', 'string'))"}
   }`;
 }
-function importStatementForModel(originControllerName, destinationModelName) {
-    return `import ${globalClassNameFromFullyQualifiedModelName(destinationModelName)} from '${relativePsychicPath('controllers', 'models', originControllerName, destinationModelName)}'`;
+function importStatementForModel(destinationModelName) {
+    return `import ${globalClassNameFromFullyQualifiedModelName(destinationModelName)} from '${absoluteDreamPath('models', destinationModelName)}'`;
 }
 function aOrAnDreamModelName(dreamName) {
     if (/^[aeiou]/.test(dreamName))

package/dist/esm/src/generate/helpers/generateResourceControllerSpecContent.js

@@ -1,7 +1,5 @@
-import { camelize, capitalize, compact, globalClassNameFromFullyQualifiedModelName, standardizeFullyQualifiedModelName, uniq, } from '@rvoh/dream';
+import { absoluteDreamPath, camelize, capitalize, compact, globalClassNameFromFullyQualifiedModelName, standardizeFullyQualifiedModelName, uniq, } from '@rvoh/dream';
 import addImportSuffix from '../../helpers/path/addImportSuffix.js';
-import relativePsychicPath from '../../helpers/path/relativePsychicPath.js';
-import updirsFromPath from '../../helpers/path/updirsFromPath.js';
 import { pluralize } from '../../index.js';
 export default function generateResourceControllerSpecContent({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, owningModel, forAdmin, singular, actions, }) {
     fullyQualifiedModelName = standardizeFullyQualifiedModelName(fullyQualifiedModelName);
@@ -17,14 +15,13 @@ export default function generateResourceControllerSpecContent({ fullyQualifiedCo
     const owningModelVariableName = owningModelName ? camelize(owningModelName) : userVariableName;
     const dreamImports = [];
     const importStatements = compact([
-        importStatementForModel(fullyQualifiedControllerName, fullyQualifiedModelName),
-        importStatementForModel(fullyQualifiedControllerName, userModelName),
-        owningModel ? importStatementForModel(fullyQualifiedControllerName, owningModel) : undefined,
-        importStatementForModelFactory(fullyQualifiedControllerName, fullyQualifiedModelName),
-        importStatementForModelFactory(fullyQualifiedControllerName, userModelName),
-        owningModel ? importStatementForModelFactory(fullyQualifiedControllerName, owningModel) : undefined,
+        importStatementForModel(fullyQualifiedModelName),
+        importStatementForModel(userModelName),
+        owningModel ? importStatementForModel(owningModel) : undefined,
+        importStatementForModelFactory(fullyQualifiedModelName),
+        importStatementForModelFactory(userModelName),
+        owningModel ? importStatementForModelFactory(owningModel) : undefined,
     ]);
-    const specUnitUpdirs = updirsFromPath(fullyQualifiedControllerName);
     const attributeCreationKeyValues = [];
     const attributeUpdateKeyValues = [];
     const comparableOriginalAttributeKeyValues = [];
@@ -126,7 +123,7 @@ export default function generateResourceControllerSpecContent({ fullyQualifiedCo
     const omitUpdate = !actions.includes('update');
     const omitDestroy = !actions.includes('destroy');
     return `${dreamImports.length ? `import { ${uniq(dreamImports).join(', ')} } from '@rvoh/dream'\n` : ''}${uniq(importStatements).join('\n')}
-import { RequestBody, session, SpecRequestType } from '${specUnitUpdirs}helpers/${addImportSuffix('authentication.js')}'
+import { RequestBody, session, SpecRequestType } from '@spec/helpers/${addImportSuffix('authentication.js')}'
 
 describe('${fullyQualifiedControllerName}', () => {
   let request: SpecRequestType
@@ -340,11 +337,11 @@ describe('${fullyQualifiedControllerName}', () => {
 })
 `;
 }
-function importStatementForModel(originModelName, destinationModelName = originModelName) {
-    return `import ${globalClassNameFromFullyQualifiedModelName(destinationModelName)} from '${relativePsychicPath('controllerSpecs', 'models', originModelName, destinationModelName)}'`;
+function importStatementForModel(destinationModelName) {
+    return `import ${globalClassNameFromFullyQualifiedModelName(destinationModelName)} from '${absoluteDreamPath('models', destinationModelName)}'`;
 }
-function importStatementForModelFactory(originModelName, destinationModelName = originModelName) {
-    return `import create${globalClassNameFromFullyQualifiedModelName(destinationModelName)} from '${relativePsychicPath('controllerSpecs', 'factories', originModelName, destinationModelName)}'`;
+function importStatementForModelFactory(destinationModelName) {
+    return `import create${globalClassNameFromFullyQualifiedModelName(destinationModelName)} from '${absoluteDreamPath('factories', destinationModelName)}'`;
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function jsonify(val) {

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "1.13.0",
+  "version": "1.14.0-beta.1",
   "author": "RVOHealth",
   "repository": {
     "type": "git",
@@ -63,7 +63,7 @@
   "devDependencies": {
     "@eslint/js": "^9.19.0",
     "@jest-mock/express": "^3.0.0",
-    "@rvoh/dream": "^1.12.0",
+    "@rvoh/dream": "^1.13.0-beta.1",
     "@rvoh/dream-spec-helpers": "^1.2.1",
     "@rvoh/psychic-spec-helpers": "^1.1.6",
     "@types/express": "^5.0.1",