platformatic · mcollina · May 13, 2024
diff --git a/package.json b/package.json
@@ -10,17 +10,17 @@
   "scripts": {
     "create": "node ./dist/cli/create.js",
     "start": "node ./dist/cli/start.js -c ./ai-warp-app/platformatic.json",
-    "build": "tsc --build && cp -r ./static ./dist/ && cp config.d.ts dist/",
-    "build:config": "npm run build && node ./dist/lib/schema.js --dump-schema  > schema.json && json2ts > config.d.ts < schema.json",
+    "build": "tsc --build && cp -r ./static ./dist/ && cp src/config.d.ts dist/",
+    "build:config": "npm run build && node ./dist/lib/schema.js --dump-schema  > schema.json && json2ts > src/config.d.ts < schema.json",
     "prepare": "npm run build:config",
     "clean": "rm -fr ./dist",
     "lint": "ts-standard | snazzy",
     "lint:fix": "ts-standard --fix | snazzy",
     "lint-md": "markdownlint-cli2 .",
     "lint-md:fix": "markdownlint-cli2 --fix .",
     "test": "npm run test:unit && npm run test:e2e && npm run test:types",
-    "test:unit": "node --test --test-reporter=@reporters/github --test-reporter-destination=stdout --test-reporter=spec --test-reporter-destination=stdout --import=tsx --test-concurrency=1 ./tests/unit/*",
-    "test:e2e": "node --test --test-reporter=@reporters/github --test-reporter-destination=stdout --test-reporter=spec --test-reporter-destination=stdout --import=tsx --test-concurrency=1 ./tests/e2e/*",
+    "test:unit": "node --test --test-reporter=@reporters/github --test-reporter-destination=stdout --test-reporter=spec --test-reporter-destination=stdout --import=tsx --test-concurrency=1 ./src/tests/unit/*",
+    "test:e2e": "node --test --test-reporter=@reporters/github --test-reporter-destination=stdout --test-reporter=spec --test-reporter-destination=stdout --import=tsx --test-concurrency=1 ./src/tests/e2e/*",
     "test:types": "tsd"
   },
   "engines": {

diff --git a/schema.json b/schema.json
@@ -1,6 +1,6 @@
 {
   "$id": "ai-warp",
-  "version": "1.37.1",
+  "version": "0.3.1",
   "title": "Ai Warp Config",
   "type": "object",
   "properties": {

diff --git a/ai-providers/azure.ts → src/ai-providers/azure.ts b/ai-providers/azure.ts → src/ai-providers/azure.ts
diff --git a/ai-providers/event.ts → src/ai-providers/event.ts b/ai-providers/event.ts → src/ai-providers/event.ts
diff --git a/ai-providers/llama2.ts → src/ai-providers/llama2.ts b/ai-providers/llama2.ts → src/ai-providers/llama2.ts
diff --git a/ai-providers/mistral.ts → src/ai-providers/mistral.ts b/ai-providers/mistral.ts → src/ai-providers/mistral.ts
diff --git a/ai-providers/ollama.ts → src/ai-providers/ollama.ts b/ai-providers/ollama.ts → src/ai-providers/ollama.ts
diff --git a/ai-providers/open-ai.ts → src/ai-providers/open-ai.ts b/ai-providers/open-ai.ts → src/ai-providers/open-ai.ts
diff --git a/ai-providers/provider.ts → src/ai-providers/provider.ts b/ai-providers/provider.ts → src/ai-providers/provider.ts
diff --git a/cli/create.ts → src/cli/create.ts b/cli/create.ts → src/cli/create.ts
diff --git a/cli/start.ts → src/cli/start.ts b/cli/start.ts → src/cli/start.ts
diff --git a/config.d.ts → src/config.d.ts b/config.d.ts → src/config.d.ts
@@ -217,13 +217,9 @@ export interface AiWarpConfig {
         prefix?: string;
         path?: string;
       };
-      plugins?:
-        | {
-            [k: string]: unknown;
-          }
-        | {
-            [k: string]: unknown;
-          };
+      plugins?: {
+        [k: string]: unknown;
+      };
     }[];
   };
   module?: string;

diff --git a/index.d.ts → src/index.d.ts b/index.d.ts → src/index.d.ts
diff --git a/index.ts → src/index.ts b/index.ts → src/index.ts
diff --git a/lib/generator.ts → src/lib/generator.ts b/lib/generator.ts → src/lib/generator.ts
@@ -13,21 +13,19 @@
   devDependencies: Record<string, string>
 }
 
+const dir = import.meta.dirname || dirname(fileURLToPath(import.meta.url))
+const aiWarpPackageJsonPath = join(dir, '..', '..', 'package.json')
+
 class AiWarpGenerator extends ServiceGenerator {
   private _packageJson: PackageJson | null = null
 
   getDefaultConfig (): { [x: string]: BaseGenerator.JSONValue } {
     const defaultBaseConfig = super.getDefaultConfig()
     // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-    const dir = import.meta.dirname || dirname(fileURLToPath(import.meta.url))
     const defaultConfig = {
       aiProvider: 'openai',
       aiModel: 'gpt-3.5-turbo',
       localSchema: false,
-      // TODO: temporary fix, when running the typescript files directly
-      //  (in tests) this goes a directory above the actual project. Exposing
-      //  temporarily until I come up with something better
-      aiWarpPackageJsonPath: join(dir, '..', '..', 'package.json')
     }
     return Object.assign({}, defaultBaseConfig, defaultConfig)
   }
@@ -175,8 +173,7 @@
 
   async getStackablePackageJson (): Promise<PackageJson> {
     if (this._packageJson == null) {
-      const packageJsonPath = this.config.aiWarpPackageJsonPath
-      const packageJsonFile = await readFile(packageJsonPath, 'utf8')
+      const packageJsonFile = await readFile(aiWarpPackageJsonPath, 'utf8')
       const packageJson: Partial<PackageJson> = JSON.parse(packageJsonFile)
 
       if (packageJson.name === undefined || packageJson.name === null) {

diff --git a/lib/schema.ts → src/lib/schema.ts b/lib/schema.ts → src/lib/schema.ts
@@ -1,9 +1,14 @@
+import { join } from 'node:path'
+import { readFileSync } from 'node:fs'
 import { schema } from '@platformatic/service'
 
+const { version } = JSON.parse(readFileSync(join(import.meta.dirname, '..', '..', 'package.json'), 'utf-8'))
+
 const aiWarpSchema = {
   ...schema.schema,
   $id: 'ai-warp',
   title: 'Ai Warp Config',
+  version,
   properties: {
     ...schema.schema.properties,
     module: { type: 'string' },

diff --git a/lib/templates/types.ts → src/lib/templates/types.ts b/lib/templates/types.ts → src/lib/templates/types.ts
diff --git a/plugins/api.ts → src/plugins/api.ts b/plugins/api.ts → src/plugins/api.ts
diff --git a/plugins/auth.ts → src/plugins/auth.ts b/plugins/auth.ts → src/plugins/auth.ts
diff --git a/plugins/rate-limiting.ts → src/plugins/rate-limiting.ts b/plugins/rate-limiting.ts → src/plugins/rate-limiting.ts
diff --git a/plugins/warp.ts → src/plugins/warp.ts b/plugins/warp.ts → src/plugins/warp.ts
diff --git a/tests/e2e/api.test.ts → src/tests/e2e/api.test.ts b/tests/e2e/api.test.ts → src/tests/e2e/api.test.ts
diff --git a/tests/e2e/auth.test.ts → src/tests/e2e/auth.test.ts b/tests/e2e/auth.test.ts → src/tests/e2e/auth.test.ts
diff --git a/tests/e2e/rate-limiting.test.ts → src/tests/e2e/rate-limiting.test.ts b/tests/e2e/rate-limiting.test.ts → src/tests/e2e/rate-limiting.test.ts
diff --git a/tests/types/README.md → src/tests/types/README.md b/tests/types/README.md → src/tests/types/README.md
diff --git a/tests/types/fastify.test-d.ts → src/tests/types/fastify.test-d.ts b/tests/types/fastify.test-d.ts → src/tests/types/fastify.test-d.ts
diff --git a/tests/types/schema.test-d.ts → src/tests/types/schema.test-d.ts b/tests/types/schema.test-d.ts → src/tests/types/schema.test-d.ts
diff --git a/tests/unit/.gitignore → src/tests/unit/.gitignore b/tests/unit/.gitignore → src/tests/unit/.gitignore
diff --git a/tests/unit/ai-providers.test.ts → src/tests/unit/ai-providers.test.ts b/tests/unit/ai-providers.test.ts → src/tests/unit/ai-providers.test.ts
diff --git a/tests/unit/generator.test.ts → src/tests/unit/generator.test.ts b/tests/unit/generator.test.ts → src/tests/unit/generator.test.ts
@@ -41,7 +41,6 @@ describe('AiWarpGenerator', () => {
     const generator = new AiWarpGenerator()
     generator.setConfig({
       targetDirectory: dir,
-      aiWarpPackageJsonPath: join(import.meta.dirname, '..', '..', 'package.json'),
       aiProvider: 'openai',
       aiModel: 'gpt-3.5-turbo'
     })
@@ -57,7 +56,6 @@ describe('AiWarpGenerator', () => {
     const generator = new AiWarpGenerator()
     generator.setConfig({
       targetDirectory: dir,
-      aiWarpPackageJsonPath: join(import.meta.dirname, '..', '..', 'package.json'),
       aiProvider: 'openai',
       aiModel: 'gpt-3.5-turbo'
     })
@@ -77,7 +75,6 @@ describe('AiWarpGenerator', () => {
     const generator = new AiWarpGenerator()
     generator.setConfig({
       targetDirectory: dir,
-      aiWarpPackageJsonPath: join(import.meta.dirname, '..', '..', 'package.json'),
       aiProvider: 'openai',
       aiModel: 'gpt-3.5-turbo'
     })
@@ -112,7 +109,6 @@ describe('AiWarpGenerator', () => {
     const generator = new AiWarpGenerator()
     generator.setConfig({
       targetDirectory: dir,
-      aiWarpPackageJsonPath: join(import.meta.dirname, '..', '..', 'package.json'),
       aiProvider: 'openai',
       aiModel: 'gpt-3.5-turbo'
     })
@@ -128,7 +124,6 @@ describe('AiWarpGenerator', () => {
     const generator = new AiWarpGenerator()
     generator.setConfig({
       targetDirectory: dir,
-      aiWarpPackageJsonPath: join(import.meta.dirname, '..', '..', 'package.json'),
       aiProvider: 'openai',
       aiModel: 'gpt-3.5-turbo',
       plugin: true
@@ -148,7 +143,6 @@ describe('AiWarpGenerator', () => {
     const generator = new AiWarpGenerator()
     generator.setConfig({
       targetDirectory: dir,
-      aiWarpPackageJsonPath: join(import.meta.dirname, '..', '..', 'package.json'),
       aiProvider: 'openai',
       aiModel: 'gpt-3.5-turbo',
       plugin: true,

diff --git a/tests/utils/auth.ts → src/tests/utils/auth.ts b/tests/utils/auth.ts → src/tests/utils/auth.ts
diff --git a/tests/utils/mocks/azure.ts → src/tests/utils/mocks/azure.ts b/tests/utils/mocks/azure.ts → src/tests/utils/mocks/azure.ts
diff --git a/tests/utils/mocks/base.ts → src/tests/utils/mocks/base.ts b/tests/utils/mocks/base.ts → src/tests/utils/mocks/base.ts
diff --git a/tests/utils/mocks/index.ts → src/tests/utils/mocks/index.ts b/tests/utils/mocks/index.ts → src/tests/utils/mocks/index.ts
diff --git a/tests/utils/mocks/llama2.ts → src/tests/utils/mocks/llama2.ts b/tests/utils/mocks/llama2.ts → src/tests/utils/mocks/llama2.ts
diff --git a/tests/utils/mocks/mistral.ts → src/tests/utils/mocks/mistral.ts b/tests/utils/mocks/mistral.ts → src/tests/utils/mocks/mistral.ts
diff --git a/tests/utils/mocks/ollama.ts → src/tests/utils/mocks/ollama.ts b/tests/utils/mocks/ollama.ts → src/tests/utils/mocks/ollama.ts
diff --git a/tests/utils/mocks/open-ai.ts → src/tests/utils/mocks/open-ai.ts b/tests/utils/mocks/open-ai.ts → src/tests/utils/mocks/open-ai.ts
diff --git a/tests/utils/stackable.ts → src/tests/utils/stackable.ts b/tests/utils/stackable.ts → src/tests/utils/stackable.ts