@travetto/scaffold 7.0.10 → 7.0.11

package/bin/trv-scaffold.js

@@ -1,19 +1,17 @@
 #!/usr/bin/env node
 // @ts-check
-import { delimiter } from 'node:path';
+import { resolve } from 'node:path';
 import { writeFileSync, readFileSync } from 'node:fs';
+import '@travetto/compiler/bin/hook.js';
 
-await import('@travetto/compiler/bin/hook.js');
-
-const { invoke } = await import('@travetto/compiler/support/invoke.ts');
+const current = process.cwd();
 
 if (process.env.npm_lifecycle_script?.includes('trv-scaffold')) { // Is npx  run
-  writeFileSync('package.json', JSON.stringify({ ...JSON.parse(readFileSync('./package.json', 'utf-8')), type: 'module' }));
-  const parts = process.env.PATH?.split(delimiter) ?? [];
-  const item = parts.find(part => part.includes('npx') && part.includes('.bin'));
-  if (item) {
-    process.chdir(item.split('/node_modules')[0]);
-  }
+  const folder = import.meta.dirname.split('node_modules')[0];
+  const pkg = resolve(folder, 'package.json');
+  writeFileSync(pkg, JSON.stringify({ ...JSON.parse(readFileSync(pkg, 'utf-8')), type: 'module' }));
+  process.chdir(folder);
 }
 
-await invoke('exec', ['@travetto/cli/support/entry.trv.js', 'scaffold', '-c', process.cwd(), ...process.argv.slice(2)]);
+const { invoke } = await import('@travetto/compiler/support/invoke.ts');
+await invoke('exec', ['@travetto/cli/support/entry.trv.js', 'scaffold', '-c', current, ...process.argv.slice(2)]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/scaffold",
-  "version": "7.0.10",
+  "version": "7.0.11",
   "type": "module",
   "description": "App Scaffold for the Travetto framework",
   "keywords": [
@@ -28,8 +28,8 @@
     "trv-scaffold": "bin/trv-scaffold.js"
   },
   "dependencies": {
-    "@travetto/cli": "^7.0.7",
-    "@travetto/compiler": "^7.0.5",
+    "@travetto/cli": "^7.0.8",
+    "@travetto/compiler": "^7.0.6",
     "@travetto/runtime": "^7.0.5",
     "enquirer": "^2.4.1",
     "mustache": "^4.2.0"

package/resources/templates/todo/src/model/todo.ts

@@ -1,4 +1,4 @@
-import { Model, ModelType } from '@travetto/model';
+import { Model, type ModelType } from '@travetto/model';
 
 @Model()
 export class Todo implements ModelType {

package/resources/templates/todo/src/web/auth.config.ts

@@ -1,8 +1,8 @@
-import { Authorizer, Authenticator, AuthenticationError } from '@travetto/auth';
+import { type Authorizer, type Authenticator, AuthenticationError } from '@travetto/auth';
 import { SessionModelSymbol } from '@travetto/auth-session';
 import { InjectableFactory } from '@travetto/di';
-import { ModelExpirySupport } from '@travetto/model';
-import { MemoryModelService } from '@travetto/model-memory';
+import type { ModelExpirySupport } from '@travetto/model';
+import type { MemoryModelService } from '@travetto/model-memory';
 
 export const BasicAuthSymbol = Symbol.for('AUTH_BASIC');
 

package/resources/templates/todo/src/web/auth.ts

@@ -1,8 +1,8 @@
 import { Controller, Get, Post, WebResponse, ContextParam } from '@travetto/web';
 import { Login, Authenticated, Logout } from '@travetto/auth-web';
-import { Principal } from '@travetto/auth';
+import type { Principal } from '@travetto/auth';
 
-import { BasicAuthSymbol } from './auth.config';
+import { BasicAuthSymbol } from './auth.config.ts';
 
 /**
  * Auth API

package/resources/templates/todo/src/web/todo.ts

@@ -1,16 +1,16 @@
 import { Controller, Get, Put, Post, Delete } from '@travetto/web';
 import { NotFoundError } from '@travetto/model';
 import { Inject } from '@travetto/di';
-import { ModelQuery } from '@travetto/model-query';
+import type { ModelQuery } from '@travetto/model-query';
 import { Schema } from '@travetto/schema';
 // {{#modules.auth}}
-import { AuthContext } from '@travetto/auth';
+import type { AuthContext } from '@travetto/auth';
 // {{/modules.auth}}
 // {{#modules.auth_web}}
 import { Authenticated } from '@travetto/auth-web';
 // {{/modules.auth_web}}
 // @ts-expect-error
-import { $_modelService_$ } from '$_modelImport_$';
+import type { $_modelService_$ } from '$_modelImport_$';
 
 import { Todo } from '../model/todo.ts';
 

package/resources/templates/todo/test/model/todo.ts

@@ -1,8 +1,9 @@
 import assert from 'node:assert';
 
 import { Suite, Test } from '@travetto/test';
-import { ModelCrudSupport } from '@travetto/model';
+import type { ModelCrudSupport } from '@travetto/model';
 import { BaseModelSuite } from '@travetto/model/support/test/base.ts';
+// @ts-expect-error
 import { $_modelConfig_$, $_modelService_$ } from '$_modelImport_$';
 
 import { Todo } from '../../src/model/todo.ts';