@rvoh/psychic 3.6.0 → 3.7.0

package/dist/cjs/src/cli/index.js

@@ -132,8 +132,9 @@ ${INDENT}  pnpm psy g:sti-child --model-name=House Rental/House extends Rental
 ${INDENT}  pnpm psy g:sti-child --model-name=Condo Rental/Condo extends Rental`, false)
             .option('--owning-model <modelName>', `The model class that owns this resource. The generated controller will use \`associationQuery\` and \`createAssociation\` on the owning model to scope queries and create records.
 ${INDENT}
-${INDENT}Defaults to \`this.currentUser\` for non-admin/internal routes (e.g., \`this.currentUser.associationQuery('posts').findOrFail(this.castParam('id', 'uuid'))\`).
-${INDENT}Defaults to \`null\` for admin/internal namespaced controllers (e.g., \`Post.findOrFail(this.castParam('id', 'uuid'))\`).
+${INDENT}Defaults to \`this.currentUser\` for non-admin routes (e.g., \`this.currentUser.associationQuery('posts').findOrFail(this.castParam('id', 'uuid'))\`).
+${INDENT}Defaults to \`this.currentInternalUser\` for internal namespaced controllers (e.g., \`this.currentInternalUser.associationQuery('posts').findOrFail(this.castParam('id', 'uuid'))\`).
+${INDENT}Defaults to \`null\` for admin namespaced controllers (e.g., \`Post.findOrFail(this.castParam('id', 'uuid'))\`).
 ${INDENT}Supplying an owning-modle changes the the generated code in the controller to be relative to the owning model.
 ${INDENT}
 ${INDENT}Example:
@@ -152,7 +153,7 @@ ${INDENT}  # model is named GroupDanceLesson instead of LessonDanceGroup`)
             .option('--no-soft-delete', `skip generating the @SoftDelete() decorator and the corresponding nullable \`deleted_at\` column. By default, generated models use soft-delete semantics (rows are marked deleted via \`deleted_at\` instead of being removed from the database). Pass this flag when you want records to be hard-deleted.`)
             .argument('<path>', `The URL path for this resource's routes, relative to the root domain. Use \`\\{\\}\` as a placeholder for a parent resource's ID parameter when nesting.
 ${INDENT}
-${INDENT}The path determines the controller namespace hierarchy. Paths that begin with "admin" and "internal" remove the \`currentUser\` scoping of queries (\`--owning-model\` may be provided to apply query scoping). Each segment maps to a directory level in the controllers folder.
+${INDENT}The path determines the controller namespace hierarchy. Paths that begin with "internal" scope queries to \`this.currentInternalUser\` instead of \`this.currentUser\`. Paths that begin with "admin" remove owner scoping of queries entirely (\`--owning-model\` may be provided to apply query scoping). Each segment maps to a directory level in the controllers folder.
 ${INDENT}
 ${INDENT}Examples:
 ${INDENT}  v1/posts                          # /v1/posts, /v1/posts/:id

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

@@ -13,8 +13,10 @@ export default function generateControllerContent({ ancestorName, ancestorImport
     fullyQualifiedControllerName = DreamApp.system.standardizeFullyQualifiedModelName(fullyQualifiedControllerName);
     const additionalImports = [];
     const controllerClassName = DreamApp.system.globalClassNameFromFullyQualifiedModelName(fullyQualifiedControllerName);
-    // Determine user model variables
-    const actualOwningModel = owningModel || 'User';
+    // Determine user model variables. Internal-namespaced controllers scope to
+    // the current internal user the same way default controllers scope to the
+    // current user; only the Admin namespace bypasses owner scoping entirely.
+    const actualOwningModel = owningModel || (forInternal ? 'InternalUser' : 'User');
     const owningModelClassName = DreamApp.system.globalClassNameFromFullyQualifiedModelName(actualOwningModel);
     const owningModelProperty = `current${owningModelClassName}`;
     let modelClassName;
@@ -34,7 +36,7 @@ export default function generateControllerContent({ ancestorName, ancestorImport
             ? `
     serializerKey: 'internal',`
             : '';
-    const useDirectModelAccess = (forAdmin || forInternal) && !owningModel;
+    const useDirectModelAccess = forAdmin && !owningModel;
     const loadQueryBase = useDirectModelAccess
         ? (modelClassName ?? 'no-class-name')
         : `this.${owningModelProperty}.associationQuery('${pluralizedModelAttributeName}')`;

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

@@ -31,7 +31,7 @@ function createModelConfiguration(options) {
     const owningModelVariableName = options.owningModel
         ? camelize(DreamApp.system.standardizeFullyQualifiedModelName(options.owningModel).split('/').pop())
         : userVariableName;
-    const useDirectModelAccess = (options.forAdmin || options.forInternal) && !options.owningModel;
+    const useDirectModelAccess = options.forAdmin && !options.owningModel;
     const simpleCreationCommand = `const ${modelVariableName} = await create${modelClassName}(${useDirectModelAccess ? '' : `{ ${owningModelVariableName} }`})`;
     return {
         fullyQualifiedModelName,

package/dist/esm/src/cli/index.js

@@ -132,8 +132,9 @@ ${INDENT}  pnpm psy g:sti-child --model-name=House Rental/House extends Rental
 ${INDENT}  pnpm psy g:sti-child --model-name=Condo Rental/Condo extends Rental`, false)
             .option('--owning-model <modelName>', `The model class that owns this resource. The generated controller will use \`associationQuery\` and \`createAssociation\` on the owning model to scope queries and create records.
 ${INDENT}
-${INDENT}Defaults to \`this.currentUser\` for non-admin/internal routes (e.g., \`this.currentUser.associationQuery('posts').findOrFail(this.castParam('id', 'uuid'))\`).
-${INDENT}Defaults to \`null\` for admin/internal namespaced controllers (e.g., \`Post.findOrFail(this.castParam('id', 'uuid'))\`).
+${INDENT}Defaults to \`this.currentUser\` for non-admin routes (e.g., \`this.currentUser.associationQuery('posts').findOrFail(this.castParam('id', 'uuid'))\`).
+${INDENT}Defaults to \`this.currentInternalUser\` for internal namespaced controllers (e.g., \`this.currentInternalUser.associationQuery('posts').findOrFail(this.castParam('id', 'uuid'))\`).
+${INDENT}Defaults to \`null\` for admin namespaced controllers (e.g., \`Post.findOrFail(this.castParam('id', 'uuid'))\`).
 ${INDENT}Supplying an owning-modle changes the the generated code in the controller to be relative to the owning model.
 ${INDENT}
 ${INDENT}Example:
@@ -152,7 +153,7 @@ ${INDENT}  # model is named GroupDanceLesson instead of LessonDanceGroup`)
             .option('--no-soft-delete', `skip generating the @SoftDelete() decorator and the corresponding nullable \`deleted_at\` column. By default, generated models use soft-delete semantics (rows are marked deleted via \`deleted_at\` instead of being removed from the database). Pass this flag when you want records to be hard-deleted.`)
             .argument('<path>', `The URL path for this resource's routes, relative to the root domain. Use \`\\{\\}\` as a placeholder for a parent resource's ID parameter when nesting.
 ${INDENT}
-${INDENT}The path determines the controller namespace hierarchy. Paths that begin with "admin" and "internal" remove the \`currentUser\` scoping of queries (\`--owning-model\` may be provided to apply query scoping). Each segment maps to a directory level in the controllers folder.
+${INDENT}The path determines the controller namespace hierarchy. Paths that begin with "internal" scope queries to \`this.currentInternalUser\` instead of \`this.currentUser\`. Paths that begin with "admin" remove owner scoping of queries entirely (\`--owning-model\` may be provided to apply query scoping). Each segment maps to a directory level in the controllers folder.
 ${INDENT}
 ${INDENT}Examples:
 ${INDENT}  v1/posts                          # /v1/posts, /v1/posts/:id

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

@@ -13,8 +13,10 @@ export default function generateControllerContent({ ancestorName, ancestorImport
     fullyQualifiedControllerName = DreamApp.system.standardizeFullyQualifiedModelName(fullyQualifiedControllerName);
     const additionalImports = [];
     const controllerClassName = DreamApp.system.globalClassNameFromFullyQualifiedModelName(fullyQualifiedControllerName);
-    // Determine user model variables
-    const actualOwningModel = owningModel || 'User';
+    // Determine user model variables. Internal-namespaced controllers scope to
+    // the current internal user the same way default controllers scope to the
+    // current user; only the Admin namespace bypasses owner scoping entirely.
+    const actualOwningModel = owningModel || (forInternal ? 'InternalUser' : 'User');
     const owningModelClassName = DreamApp.system.globalClassNameFromFullyQualifiedModelName(actualOwningModel);
     const owningModelProperty = `current${owningModelClassName}`;
     let modelClassName;
@@ -34,7 +36,7 @@ export default function generateControllerContent({ ancestorName, ancestorImport
             ? `
     serializerKey: 'internal',`
             : '';
-    const useDirectModelAccess = (forAdmin || forInternal) && !owningModel;
+    const useDirectModelAccess = forAdmin && !owningModel;
     const loadQueryBase = useDirectModelAccess
         ? (modelClassName ?? 'no-class-name')
         : `this.${owningModelProperty}.associationQuery('${pluralizedModelAttributeName}')`;

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

@@ -31,7 +31,7 @@ function createModelConfiguration(options) {
     const owningModelVariableName = options.owningModel
         ? camelize(DreamApp.system.standardizeFullyQualifiedModelName(options.owningModel).split('/').pop())
         : userVariableName;
-    const useDirectModelAccess = (options.forAdmin || options.forInternal) && !options.owningModel;
+    const useDirectModelAccess = options.forAdmin && !options.owningModel;
     const simpleCreationCommand = `const ${modelVariableName} = await create${modelClassName}(${useDirectModelAccess ? '' : `{ ${owningModelVariableName} }`})`;
     return {
         fullyQualifiedModelName,

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "author": "RVOHealth",
   "repository": {
     "type": "git",