@kinotic-ai/kinotic-cli 2.1.1 → 2.2.0

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @kinotic-ai/kinotic-cli
 $ kinotic COMMAND
 running command...
 $ kinotic (--version)
-@kinotic-ai/kinotic-cli/2.1.1 darwin-arm64 node-v22.13.1
+@kinotic-ai/kinotic-cli/2.2.0 darwin-arm64 node-v22.13.1
 $ kinotic --help [COMMAND]
 USAGE
   $ kinotic COMMAND
@@ -91,7 +91,7 @@ EXAMPLES
   $ kinotic create project MyProjectName
 ```
 
-_See code: [src/commands/create/project.ts](https://github.com/kinotic-ai/kinotic/blob/v2.1.1/src/commands/create/project.ts)_
+_See code: [src/commands/create/project.ts](https://github.com/kinotic-ai/kinotic/blob/v2.2.0/src/commands/create/project.ts)_
 
 ## `kinotic gen`
 
@@ -149,7 +149,7 @@ EXAMPLES
   $ kinotic gen --force
 ```
 
-_See code: [src/commands/generate.ts](https://github.com/kinotic-ai/kinotic/blob/v2.1.1/src/commands/generate.ts)_
+_See code: [src/commands/generate.ts](https://github.com/kinotic-ai/kinotic/blob/v2.2.0/src/commands/generate.ts)_
 
 ## `kinotic help [COMMAND]`
 
@@ -231,7 +231,7 @@ EXAMPLES
   $ kinotic init -a my.app -e path/to/entities -r path/to/repository --mirror
 ```
 
-_See code: [src/commands/initialize.ts](https://github.com/kinotic-ai/kinotic/blob/v2.1.1/src/commands/initialize.ts)_
+_See code: [src/commands/initialize.ts](https://github.com/kinotic-ai/kinotic/blob/v2.2.0/src/commands/initialize.ts)_
 
 ## `kinotic plugins`
 
@@ -587,7 +587,7 @@ EXAMPLES
   $ kinotic sync -p -v -s http://localhost:9090
 ```
 
-_See code: [src/commands/synchronize.ts](https://github.com/kinotic-ai/kinotic/blob/v2.1.1/src/commands/synchronize.ts)_
+_See code: [src/commands/synchronize.ts](https://github.com/kinotic-ai/kinotic/blob/v2.2.0/src/commands/synchronize.ts)_
 
 ## `kinotic update [CHANNEL]`
 

package/dist/commands/initialize.js

@@ -4,7 +4,7 @@ import path from 'path';
 import chalk from 'chalk';
 import { input } from '@inquirer/prompts';
 import { isKinoticProject, saveKinoticProjectConfig } from '../internal/state/KinoticProjectConfigUtil.js';
-import { KinoticProjectConfig } from '@kinotic-ai/core';
+import { KinoticProjectConfig } from '@kinotic-ai/os-api';
 /**
  * Validates the application name according to server requirements:
  * - First character must be a letter

package/dist/commands/synchronize.js

@@ -62,10 +62,10 @@ export class Synchronize extends Command {
                         //      This will evict the named query execution plan cache
                         //      We want to make sure the GraphQL schema is updated after both these are updated and the EntityDefinition below
                         if (!flags.dryRun && namedQueries.length > 0) {
-                            await this.synchronizeNamedQueries(project.id, entityInfo.entity, namedQueries);
+                            await this.synchronizeNamedQueries(kinoticProjectConfig.organization, project.id, entityInfo.entity, namedQueries);
                         }
                         if (!flags.dryRun) {
-                            await this.synchronizeEntity(project.id, entityInfo.entity, flags.publish, flags.verbose);
+                            await this.synchronizeEntity(kinoticProjectConfig.organization, project.id, entityInfo.entity, flags.publish, flags.verbose);
                         }
                     }, flags.force);
                     // Apply migrations after entity synchronization
@@ -104,11 +104,11 @@ export class Synchronize extends Command {
             }
         }
     }
-    async synchronizeEntity(projectId, entitySchema, publish, verbose) {
+    async synchronizeEntity(organizationId, projectId, entitySchema, publish, verbose) {
         const entityDefinitionService = Kinotic.entityDefinitions;
         const application = entitySchema.namespace;
         const name = entitySchema.name;
-        const entityDefinitionId = (application + '.' + name).toLowerCase();
+        const entityDefinitionId = (organizationId + '.' + application + '.' + name).toLowerCase();
         this.log(`Synchronizing Entity: ${application}.${name}`);
         try {
             let entityDefinition = await entityDefinitionService.findById(entityDefinitionId);
@@ -122,7 +122,7 @@ export class Synchronize extends Command {
                 entityDefinition = await entityDefinitionService.save(entityDefinition);
             }
             else {
-                entityDefinition = new EntityDefinition(application, projectId, name, entitySchema);
+                entityDefinition = new EntityDefinition(organizationId, application, projectId, name, entitySchema);
                 this.logVerbose(`Creating Entity: ${application}.${name}`, verbose);
                 entityDefinition = await entityDefinitionService.create(entityDefinition);
             }
@@ -137,11 +137,11 @@ export class Synchronize extends Command {
             this.log(chalk.red('Error') + ` Synchronizing Entity: ${entityDefinitionId}, Exception: ${message}`);
         }
     }
-    async synchronizeNamedQueries(projectId, entitySchema, namedQueries) {
+    async synchronizeNamedQueries(organizationId, projectId, entitySchema, namedQueries) {
         const namedQueriesService = Kinotic.namedQueriesDefinitions;
         const application = entitySchema.namespace;
         const entityDefinitionName = entitySchema.name;
-        const id = (application + '.' + entityDefinitionName).toLowerCase();
+        const id = (organizationId + '.' + application + '.' + entityDefinitionName).toLowerCase();
         this.log(`Synchronizing Named Queries for Entity: ${application}.${entityDefinitionName}`);
         try {
             const namedQueriesDefinition = new NamedQueriesDefinition(id, application, projectId, entityDefinitionName, namedQueries);

package/dist/internal/EntityCodeGenerationService.d.ts

@@ -1,4 +1,4 @@
-import { KinoticProjectConfig } from '@kinotic-ai/core';
+import { KinoticProjectConfig } from '@kinotic-ai/os-api';
 import { Logger } from './Logger.js';
 import { EntityInfo, GeneratedServiceInfo } from './Utils.js';
 export type GeneratedEntityProcessor = (entityInfo: EntityInfo, serviceInfo: GeneratedServiceInfo[]) => Promise<void>;

package/dist/internal/EntityCodeGenerationService.js

@@ -152,6 +152,7 @@ export class EntityCodeGenerationService {
         const baseReadStream = await this.engine.renderFileToNodeStream(`Base${adminPrefix}Repository`, {
             entityName,
             entityNamespace,
+            organizationId: projectConfig.organization,
             defaultExport,
             entityImportPath,
             validationLogic,

package/dist/internal/state/KinoticProjectConfigUtil.d.ts

@@ -1,4 +1,4 @@
-import type { KinoticProjectConfig } from '@kinotic-ai/core';
+import type { KinoticProjectConfig } from '@kinotic-ai/os-api';
 /**
  * Saves a KinoticProjectConfig to the .config directory using the appropriate Liquid template.
  * @param config The config object to save

package/dist/templates/KinoticProjectConfig.ts.liquid

@@ -3,7 +3,7 @@
   Usage: Render with context { config, typeName }
 {% endcomment %}
 
-import type KinoticProjectConfig from '@kinotic-ai/core'
+import type { KinoticProjectConfig } from '@kinotic-ai/os-api'
 
 const config: KinoticProjectConfig = {% render_value config %}
 

package/dist/templates/entity/AdminRepository.liquid

@@ -1,4 +1,4 @@
-import { type IAdminEntityRepository } from '@kinotic-ai/persistence'
+import { type IAdminEntitiesRepository } from '@kinotic-ai/persistence'
 import { Base{{ entityName }}AdminRepository } from './generated/Base{{ entityName }}AdminRepository{{ fileExtensionForImports }}'
 
 /**
@@ -7,7 +7,7 @@ import { Base{{ entityName }}AdminRepository } from './generated/Base{{ entityNa
  */
 export class {{ entityName }}AdminRepository extends Base{{ entityName }}AdminRepository {
 
-  constructor(adminEntitiesService?: IAdminEntityRepository) {
+  constructor(adminEntitiesService?: IAdminEntitiesRepository) {
     super(adminEntitiesService)
   }
 

package/dist/templates/entity/BaseAdminRepository.liquid

@@ -13,7 +13,7 @@ import { {{ entityName }} } from '{{ entityImportPath }}'
 export class Base{{ entityName }}AdminRepository extends AdminEntityRepository<{{ entityName }}> {
 
   constructor(adminEntitiesService?: IAdminEntitiesRepository) {
-    super('{{ entityNamespace }}', '{{ entityName }}', adminEntitiesService)
+    super('{{ organizationId }}', '{{ entityNamespace }}', '{{ entityName }}', adminEntitiesService)
   }
 
 }

package/dist/templates/entity/BaseRepository.liquid

@@ -15,7 +15,7 @@ export class Base{{ entityName }}Repository extends EntityRepository<{{ entityNa
   private readonly shouldValidate: boolean
 
   constructor(shouldValidate: boolean = true, entitiesRepository?: IEntitiesRepository) {
-    super('{{ entityNamespace }}', '{{ entityName }}', entitiesRepository)
+    super('{{ organizationId }}', '{{ entityNamespace }}', '{{ entityName }}', entitiesRepository)
     this.shouldValidate = shouldValidate
   }
 

package/dist/templates/spawns/project/.config/kinotic.config.ts.liquid

@@ -1,7 +1,8 @@
-import type { KinoticProjectConfig } from '@kinotic-ai/core'
+import type { KinoticProjectConfig } from '@kinotic-ai/os-api'
 
 const config: KinoticProjectConfig = {
-  application: "load-testing",
+  organization: "{{ organization }}",
+  application: "{{ application }}",
   entitiesPaths: [
     {
       path: "packages/domain/model",

package/oclif.manifest.json

@@ -209,5 +209,5 @@
       ]
     }
   },
-  "version": "2.1.1"
+  "version": "2.2.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kinotic-ai/kinotic-cli",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Kinotic CLI provides the ability to build, deploy, and manage Kinotic applications that run on the Kinotic OS.",
   "author": "Kinotic Developers",
   "bin": {
@@ -21,8 +21,8 @@
     "@inquirer/prompts": "^8.3.2",
     "@kinotic-ai/core": "^1.1.1",
     "@kinotic-ai/idl": "^1.0.9",
-    "@kinotic-ai/os-api": "^1.0.11",
-    "@kinotic-ai/persistence": "^1.1.0",
+    "@kinotic-ai/os-api": "^1.1.0",
+    "@kinotic-ai/persistence": "^1.2.0",
     "@oclif/core": "^4.9.0",
     "@oclif/plugin-autocomplete": "^3.2.41",
     "@oclif/plugin-help": "^6",