@liquidmetal-ai/drizzle 0.4.1 → 0.4.3

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@liquidmetal-ai/drizzle",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Raindrop core operational libraries",
   "main": "dist/index.js",
   "type": "module",
   "scripts": {
     "prebuild": "npm install --ignore-scripts",
-    "prepare": "npm run build",
+    "prepublishOnly": "npm run build",
     "build": "shx rm -rf dist && tsc -b",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "lint": "eslint . --max-warnings=0",
@@ -30,7 +30,8 @@
     "shx": "^0.3.4",
     "typescript": "^5",
     "typescript-eslint": "^8.7.0",
-    "vitest": "^2.1.1"
+    "vitest": "^2.1.1",
+    "@liquidmetal-ai/raindrop-framework": "*"
   },
   "dependencies": {
     "fflate": "^0.8.2"

package/src/appify/build.test.ts

@@ -195,7 +195,7 @@ application "foo" {
   ]);
 });
 
-test('service with labels and annotations', () => {
+test('service with labels', () => {
   const CONFIG = `
 application "my-app" {
   service "my-service" {
@@ -203,11 +203,6 @@ application "my-app" {
       environment = "production"
       team = "platform"
     }
-
-    annotations = {
-      description = "Service for handling API requests"
-      version = "1.0.0"
-    }
   }
 }
 `;
@@ -223,21 +218,16 @@ application "my-app" {
   expect(apps.length).toBe(1);
   expect(apps[0]!.service.length).toBe(1);
 
-  // Check the service's labels and annotations
+  // Check the service's labels
   const service = apps[0]!.service[0]!;
 
   // Verify labels
   expect(service.labels).toBeDefined();
   expect(service.labels!['environment']).toBe('production');
   expect(service.labels!['team']).toBe('platform');
-
-  // Verify annotations
-  expect(service.annotations).toBeDefined();
-  expect(service.annotations!['description']).toBe('Service for handling API requests');
-  expect(service.annotations!['version']).toBe('1.0.0');
 });
 
-test('service with non-string labels and annotations', () => {
+test('service with non-string labels', () => {
   const CONFIG = `
 application "my-app" {
   service "my-service" {
@@ -246,11 +236,6 @@ application "my-app" {
       priority = 1
       isActive = true
     }
-
-    annotations = {
-      description = "Service for handling API requests"
-      maxInstances = 5
-    }
   }
 }
 `;
@@ -262,13 +247,12 @@ application "my-app" {
   const [_, errors] = buildManifest(ast);
 
   // Should have errors for non-string values
-  expect(errors.length).toBe(3);
+  expect(errors.length).toBe(2);
 
   // Check error messages
   const errorMessages = errors.map((err) => err.message);
   expect(errorMessages).toContain('labels must have string values, found non-string value for key "priority"');
   expect(errorMessages).toContain('labels must have string values, found non-string value for key "isActive"');
-  expect(errorMessages).toContain('annotations must have string values, found non-string value for key "maxInstances"');
 });
 
 test('service with invalid labels type', () => {
@@ -291,7 +275,7 @@ application "my-app" {
   expect(errors[0]!.message).toBe('labels must be an object');
 });
 
-test('actor with labels and annotations', () => {
+test('actor with labels', () => {
   const CONFIG = `
 application "my-app" {
   actor "my-actor" {
@@ -300,11 +284,6 @@ application "my-app" {
       team = "platform"
     }
 
-    annotations = {
-      description = "Actor for processing background jobs"
-      version = "1.0.0"
-    }
-
     visibility = "protected"
   }
 }
@@ -321,7 +300,7 @@ application "my-app" {
   expect(apps.length).toBe(1);
   expect(apps[0]!.actor.length).toBe(1);
 
-  // Check the actor's labels and annotations
+  // Check the actor's labels
   const actor = apps[0]!.actor[0]!;
 
   // Verify labels
@@ -329,16 +308,11 @@ application "my-app" {
   expect(actor.labels!['environment']).toBe('production');
   expect(actor.labels!['team']).toBe('platform');
 
-  // Verify annotations
-  expect(actor.annotations).toBeDefined();
-  expect(actor.annotations!['description']).toBe('Actor for processing background jobs');
-  expect(actor.annotations!['version']).toBe('1.0.0');
-
   // Verify other properties still work
   expect(valueOf(actor.visibility!)).toBe('protected');
 });
 
-test('observer with labels and annotations', () => {
+test('observer with labels', () => {
   const CONFIG = `
 application "my-app" {
   bucket "my-bucket" {}
@@ -349,11 +323,6 @@ application "my-app" {
       team = "platform"
     }
 
-    annotations = {
-      description = "Observer for monitoring bucket changes"
-      version = "1.0.0"
-    }
-
     source {
       bucket = "my-bucket"
     }
@@ -372,7 +341,7 @@ application "my-app" {
   expect(apps.length).toBe(1);
   expect(apps[0]!.observer.length).toBe(1);
 
-  // Check the observer's labels and annotations
+  // Check the observer's labels
   const observer = apps[0]!.observer[0]!;
 
   // Verify labels
@@ -380,11 +349,6 @@ application "my-app" {
   expect(observer.labels!['environment']).toBe('production');
   expect(observer.labels!['team']).toBe('platform');
 
-  // Verify annotations
-  expect(observer.annotations).toBeDefined();
-  expect(observer.annotations!['description']).toBe('Observer for monitoring bucket changes');
-  expect(observer.annotations!['version']).toBe('1.0.0');
-
   // Verify source still works
   expect(observer.source.length).toBe(1);
   expect(valueOf(observer.source[0]!.bucket!)).toBe('my-bucket');

package/src/appify/build.ts

@@ -34,6 +34,12 @@ export interface ConfigObject {
   start: number;
   end: number;
 }
+export const EMPTY_CONFIG_OBJECT: ConfigObject = {
+  line: 0,
+  column: 0,
+  start: 0,
+  end: 0,
+} as const;
 
 export class ConfigError {
   message: string;
@@ -222,9 +228,6 @@ export function buildApplication(node: StanzaNode): [Application | undefined, Co
           case 'labels':
             buildLabelset(app, 'labels', child, errors);
             break;
-          case 'annotations':
-            buildLabelset(app, 'annotations', child, errors);
-            break;
           default:
             errors.push({ message: 'unexpected assignment', ...child });
         }
@@ -275,9 +278,6 @@ function buildService(stanza: StanzaNode): [Service, ConfigError[]] {
           case 'labels':
             buildLabelset(service, 'labels', child, errors);
             break;
-          case 'annotations':
-            buildLabelset(service, 'annotations', child, errors);
-            break;
           default:
             errors.push({ message: 'unexpected assignment', ...child });
         }
@@ -502,9 +502,6 @@ function buildObserver(stanza: StanzaNode): [Observer, ConfigError[]] {
           case 'labels':
             buildLabelset(observer, 'labels', child, errors);
             break;
-          case 'annotations':
-            buildLabelset(observer, 'annotations', child, errors);
-            break;
           default:
             errors.push({ message: 'unexpected assignment', ...child });
         }
@@ -548,9 +545,6 @@ function buildActor(stanza: StanzaNode): [Actor, ConfigError[]] {
           case 'labels':
             buildLabelset(actor, 'labels', child, errors);
             break;
-          case 'annotations':
-            buildLabelset(actor, 'annotations', child, errors);
-            break;
           default:
             errors.push({ message: 'unexpected assignment', ...child });
         }
@@ -785,7 +779,6 @@ export class Application {
   kvStore: KvStore[] = [];
   smartBucket: SmartBucket[] = [];
   labels: Record<string, string> = {};
-  annotations: Record<string, string> = {};
 
   constructor(name: TokenString, obj: ConfigObject) {
     this.name = name;
@@ -807,7 +800,6 @@ export class Service {
   bindings: Binding[] = [];
   env: Env[] = [];
   labels: Record<string, string> = {};
-  annotations: Record<string, string> = {};
 
   constructor(name: TokenString, obj: ConfigObject) {
     this.name = name;
@@ -822,7 +814,6 @@ export class Actor {
   env: Env[] = [];
   visibility?: TokenString;
   labels: Record<string, string> = {};
-  annotations: Record<string, string> = {};
 
   constructor(name: TokenString, obj: ConfigObject) {
     this.name = name;
@@ -852,7 +843,6 @@ export class Observer {
   bindings: Binding[] = [];
   env: Env[] = [];
   labels: Record<string, string> = {};
-  annotations: Record<string, string> = {};
 
   constructor(name: TokenString, obj: ConfigObject) {
     this.name = name;

package/src/appify/validate.ts

@@ -310,7 +310,8 @@ const observerSourceValidator: Validator = {
       }
       if (
         source.bucket !== undefined &&
-        !app.bucket.some((b) => valueOf(b.name) === (source.bucket && valueOf(source.bucket)))
+        !app.bucket.some((b) => valueOf(b.name) === (source.bucket && valueOf(source.bucket))) &&
+        !app.smartBucket.some((b) => valueOf(b.name) === (source.bucket && valueOf(source.bucket)))
       ) {
         errors.push({
           message: `bucket ${source.bucket.value} not found`,

package/src/liquidmetal/v1alpha1/annotation_pb.ts

@@ -0,0 +1,299 @@
+// @generated by protoc-gen-es v2.2.5 with parameter "target=ts,import_extension=.js"
+// @generated from file liquidmetal/v1alpha1/annotation.proto (package liquidmetal.v1alpha1, syntax proto3)
+/* eslint-disable */
+
+import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1";
+import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1";
+import type { Message } from "@bufbuild/protobuf";
+
+/**
+ * Describes the file liquidmetal/v1alpha1/annotation.proto.
+ */
+export const file_liquidmetal_v1alpha1_annotation: GenFile = /*@__PURE__*/
+  fileDesc("CiVsaXF1aWRtZXRhbC92MWFscGhhMS9hbm5vdGF0aW9uLnByb3RvEhRsaXF1aWRtZXRhbC52MWFscGhhMSKOAQoUUHV0QW5ub3RhdGlvblJlcXVlc3QSFwoPb3JnYW5pemF0aW9uX2lkGAEgASgJEg8KB3VzZXJfaWQYAiABKAkSOAoHbG9jYXRvchgDIAEoCzInLmxpcXVpZG1ldGFsLnYxYWxwaGExLkFubm90YXRpb25Mb2NhdG9yEhIKCmFubm90YXRpb24YBCABKAkiUQoVUHV0QW5ub3RhdGlvblJlc3BvbnNlEjgKB2xvY2F0b3IYASABKAsyJy5saXF1aWRtZXRhbC52MWFscGhhMS5Bbm5vdGF0aW9uTG9jYXRvciJ6ChRHZXRBbm5vdGF0aW9uUmVxdWVzdBIXCg9vcmdhbml6YXRpb25faWQYASABKAkSDwoHdXNlcl9pZBgCIAEoCRI4Cgdsb2NhdG9yGAMgASgLMicubGlxdWlkbWV0YWwudjFhbHBoYTEuQW5ub3RhdGlvbkxvY2F0b3IiVQoVR2V0QW5ub3RhdGlvblJlc3BvbnNlEjwKCmFubm90YXRpb24YASABKAsyKC5saXF1aWRtZXRhbC52MWFscGhhMS5Bbm5vdGF0aW9uUmVzcG9uc2UifAoWTGlzdEFubm90YXRpb25zUmVxdWVzdBIXCg9vcmdhbml6YXRpb25faWQYASABKAkSDwoHdXNlcl9pZBgCIAEoCRI4Cgdsb2NhdG9yGAMgASgLMicubGlxdWlkbWV0YWwudjFhbHBoYTEuQW5ub3RhdGlvbkxvY2F0b3IiVgoXTGlzdEFubm90YXRpb25zUmVzcG9uc2USOwoKYW5ub3RhdGlvbhgBIAMoCzInLmxpcXVpZG1ldGFsLnYxYWxwaGExLkFubm90YXRpb25Mb2NhdG9yItEBChFBbm5vdGF0aW9uTG9jYXRvchIYChBhcHBsaWNhdGlvbl9uYW1lGAEgASgJEh4KFmFwcGxpY2F0aW9uX3ZlcnNpb25faWQYAiABKAkSGAoLbW9kdWxlX25hbWUYAyABKAlIAIgBARIRCgRpdGVtGAQgASgJSAGIAQESEAoDa2V5GAUgASgJSAKIAQESFQoIcmV2aXNpb24YBiABKAlIA4gBAUIOCgxfbW9kdWxlX25hbWVCBwoFX2l0ZW1CBgoEX2tleUILCglfcmV2aXNpb24iYwoSQW5ub3RhdGlvblJlc3BvbnNlEhIKCmFubm90YXRpb24YASABKAkSOQoIbG9jYXRpb24YAiABKAsyJy5saXF1aWRtZXRhbC52MWFscGhhMS5Bbm5vdGF0aW9uTG9jYXRvcjLXAgoRQW5ub3RhdGlvblNlcnZpY2USaAoNUHV0QW5ub3RhdGlvbhIqLmxpcXVpZG1ldGFsLnYxYWxwaGExLlB1dEFubm90YXRpb25SZXF1ZXN0GisubGlxdWlkbWV0YWwudjFhbHBoYTEuUHV0QW5ub3RhdGlvblJlc3BvbnNlEmgKDUdldEFubm90YXRpb24SKi5saXF1aWRtZXRhbC52MWFscGhhMS5HZXRBbm5vdGF0aW9uUmVxdWVzdBorLmxpcXVpZG1ldGFsLnYxYWxwaGExLkdldEFubm90YXRpb25SZXNwb25zZRJuCg9MaXN0QW5ub3RhdGlvbnMSLC5saXF1aWRtZXRhbC52MWFscGhhMS5MaXN0QW5ub3RhdGlvbnNSZXF1ZXN0Gi0ubGlxdWlkbWV0YWwudjFhbHBoYTEuTGlzdEFubm90YXRpb25zUmVzcG9uc2VC6gEKGGNvbS5saXF1aWRtZXRhbC52MWFscGhhMUIPQW5ub3RhdGlvblByb3RvUAFaTGdpdGh1Yi5jb20vbGlxdWlkbWV0YWwtYWkvcHJvdG9nZW4yL2xpcXVpZG1ldGFsL3YxYWxwaGExO2xpcXVpZG1ldGFsdjFhbHBoYTGiAgNMWFiqAhRMaXF1aWRtZXRhbC5WMWFscGhhMcoCFExpcXVpZG1ldGFsXFYxYWxwaGEx4gIgTGlxdWlkbWV0YWxcVjFhbHBoYTFcR1BCTWV0YWRhdGHqAhVMaXF1aWRtZXRhbDo6VjFhbHBoYTFiBnByb3RvMw");
+
+/**
+ * @generated from message liquidmetal.v1alpha1.PutAnnotationRequest
+ */
+export type PutAnnotationRequest = Message<"liquidmetal.v1alpha1.PutAnnotationRequest"> & {
+  /**
+   * @generated from field: string organization_id = 1;
+   */
+  organizationId: string;
+
+  /**
+   * @generated from field: string user_id = 2;
+   */
+  userId: string;
+
+  /**
+   * Locator for the object to annotate
+   *
+   * @generated from field: liquidmetal.v1alpha1.AnnotationLocator locator = 3;
+   */
+  locator?: AnnotationLocator;
+
+  /**
+   * Annotation data in structured format
+   *
+   * @generated from field: string annotation = 4;
+   */
+  annotation: string;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.PutAnnotationRequest.
+ * Use `create(PutAnnotationRequestSchema)` to create a new message.
+ */
+export const PutAnnotationRequestSchema: GenMessage<PutAnnotationRequest> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_annotation, 0);
+
+/**
+ * @generated from message liquidmetal.v1alpha1.PutAnnotationResponse
+ */
+export type PutAnnotationResponse = Message<"liquidmetal.v1alpha1.PutAnnotationResponse"> & {
+  /**
+   * Locator for the annotated object
+   *
+   * @generated from field: liquidmetal.v1alpha1.AnnotationLocator locator = 1;
+   */
+  locator?: AnnotationLocator;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.PutAnnotationResponse.
+ * Use `create(PutAnnotationResponseSchema)` to create a new message.
+ */
+export const PutAnnotationResponseSchema: GenMessage<PutAnnotationResponse> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_annotation, 1);
+
+/**
+ * @generated from message liquidmetal.v1alpha1.GetAnnotationRequest
+ */
+export type GetAnnotationRequest = Message<"liquidmetal.v1alpha1.GetAnnotationRequest"> & {
+  /**
+   * Organization ID for the request
+   *
+   * @generated from field: string organization_id = 1;
+   */
+  organizationId: string;
+
+  /**
+   * User ID for the request
+   *
+   * @generated from field: string user_id = 2;
+   */
+  userId: string;
+
+  /**
+   * Locator for the object to annotate
+   *
+   * @generated from field: liquidmetal.v1alpha1.AnnotationLocator locator = 3;
+   */
+  locator?: AnnotationLocator;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.GetAnnotationRequest.
+ * Use `create(GetAnnotationRequestSchema)` to create a new message.
+ */
+export const GetAnnotationRequestSchema: GenMessage<GetAnnotationRequest> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_annotation, 2);
+
+/**
+ * @generated from message liquidmetal.v1alpha1.GetAnnotationResponse
+ */
+export type GetAnnotationResponse = Message<"liquidmetal.v1alpha1.GetAnnotationResponse"> & {
+  /**
+   * The annotation data for the object
+   *
+   * @generated from field: liquidmetal.v1alpha1.AnnotationResponse annotation = 1;
+   */
+  annotation?: AnnotationResponse;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.GetAnnotationResponse.
+ * Use `create(GetAnnotationResponseSchema)` to create a new message.
+ */
+export const GetAnnotationResponseSchema: GenMessage<GetAnnotationResponse> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_annotation, 3);
+
+/**
+ * @generated from message liquidmetal.v1alpha1.ListAnnotationsRequest
+ */
+export type ListAnnotationsRequest = Message<"liquidmetal.v1alpha1.ListAnnotationsRequest"> & {
+  /**
+   * @generated from field: string organization_id = 1;
+   */
+  organizationId: string;
+
+  /**
+   * @generated from field: string user_id = 2;
+   */
+  userId: string;
+
+  /**
+   * Locator for the object to annotate
+   *
+   * @generated from field: liquidmetal.v1alpha1.AnnotationLocator locator = 3;
+   */
+  locator?: AnnotationLocator;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.ListAnnotationsRequest.
+ * Use `create(ListAnnotationsRequestSchema)` to create a new message.
+ */
+export const ListAnnotationsRequestSchema: GenMessage<ListAnnotationsRequest> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_annotation, 4);
+
+/**
+ * @generated from message liquidmetal.v1alpha1.ListAnnotationsResponse
+ */
+export type ListAnnotationsResponse = Message<"liquidmetal.v1alpha1.ListAnnotationsResponse"> & {
+  /**
+   * List of annotations for the object
+   *
+   * @generated from field: repeated liquidmetal.v1alpha1.AnnotationLocator annotation = 1;
+   */
+  annotation: AnnotationLocator[];
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.ListAnnotationsResponse.
+ * Use `create(ListAnnotationsResponseSchema)` to create a new message.
+ */
+export const ListAnnotationsResponseSchema: GenMessage<ListAnnotationsResponse> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_annotation, 5);
+
+/**
+ * AnnotationLocator is used to locate an annotation within the context of an application and service
+ * It includes optional fields to specify the application, service, item, version, key, and revision
+ * __EXAMPLE__ "my-app"
+ * __REQUIRED__ TRUE
+ *
+ * @generated from message liquidmetal.v1alpha1.AnnotationLocator
+ */
+export type AnnotationLocator = Message<"liquidmetal.v1alpha1.AnnotationLocator"> & {
+  /**
+   * Name of the application
+   *
+   * @generated from field: string application_name = 1;
+   */
+  applicationName: string;
+
+  /**
+   * version of the application (NOTE: CURRENT is magical value for the current version)
+   *
+   * @generated from field: string application_version_id = 2;
+   */
+  applicationVersionId: string;
+
+  /**
+   * Name of the service or module
+   *
+   * @generated from field: optional string module_name = 3;
+   */
+  moduleName?: string;
+
+  /**
+   * Optional item to annotate, e.g., an item in a bucket
+   *
+   * @generated from field: optional string item = 4;
+   */
+  item?: string;
+
+  /**
+   * Optional key for the annotation (returns a single annotation)
+   *
+   * @generated from field: optional string key = 5;
+   */
+  key?: string;
+
+  /**
+   * Optional revision of the annotation
+   *
+   * @generated from field: optional string revision = 6;
+   */
+  revision?: string;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.AnnotationLocator.
+ * Use `create(AnnotationLocatorSchema)` to create a new message.
+ */
+export const AnnotationLocatorSchema: GenMessage<AnnotationLocator> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_annotation, 6);
+
+/**
+ * @generated from message liquidmetal.v1alpha1.AnnotationResponse
+ */
+export type AnnotationResponse = Message<"liquidmetal.v1alpha1.AnnotationResponse"> & {
+  /**
+   * The annotation data
+   *
+   * @generated from field: string annotation = 1;
+   */
+  annotation: string;
+
+  /**
+   * Locator for the annotation
+   *
+   * @generated from field: liquidmetal.v1alpha1.AnnotationLocator location = 2;
+   */
+  location?: AnnotationLocator;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.AnnotationResponse.
+ * Use `create(AnnotationResponseSchema)` to create a new message.
+ */
+export const AnnotationResponseSchema: GenMessage<AnnotationResponse> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_annotation, 7);
+
+/**
+ * AnnotationService provides internal API access to annotate and apply metadata all aspects of a raindrop application, from the overall application to individual objects/items
+ *
+ * @generated from service liquidmetal.v1alpha1.AnnotationService
+ */
+export const AnnotationService: GenService<{
+  /**
+   * Annotation adds an annotation to an object in a bucket
+   *
+   * @generated from rpc liquidmetal.v1alpha1.AnnotationService.PutAnnotation
+   */
+  putAnnotation: {
+    methodKind: "unary";
+    input: typeof PutAnnotationRequestSchema;
+    output: typeof PutAnnotationResponseSchema;
+  },
+  /**
+   * GetAnnotation retrieves a specific annotation for an object
+   * It uses the AnnotationLocator to specify the object and the key of the annotation
+   * __EXAMPLE__ "my-app", "my-service", "my-item", "my-key"
+   * __REQUIRED__ TRUE
+   * __REQUIRED__ FALSE
+   * __REQUIRED__ FALSE
+   * __REQUIRED__ FALSE
+   *
+   * @generated from rpc liquidmetal.v1alpha1.AnnotationService.GetAnnotation
+   */
+  getAnnotation: {
+    methodKind: "unary";
+    input: typeof GetAnnotationRequestSchema;
+    output: typeof GetAnnotationResponseSchema;
+  },
+  /**
+   * ListAnnotations lists all annotations for a given object
+   *
+   * @generated from rpc liquidmetal.v1alpha1.AnnotationService.ListAnnotations
+   */
+  listAnnotations: {
+    methodKind: "unary";
+    input: typeof ListAnnotationsRequestSchema;
+    output: typeof ListAnnotationsResponseSchema;
+  },
+}> = /*@__PURE__*/
+  serviceDesc(file_liquidmetal_v1alpha1_annotation, 0);
+