@lblod/ember-rdfa-editor-lblod-plugins 34.0.2 → 34.1.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 34.1.0
+
+### Minor Changes
+
+- [#617](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/617) [`b77f866`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/b77f866cde0afa81671fcd8378d735eb747afa90) Thanks [@abeforgit](https://github.com/abeforgit)! - Automatically instantiate codelist options when possible
+
 ## 34.0.2
 
 ### Patch Changes

package/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.ts

@@ -341,6 +341,10 @@ function constructVariableNode(
     variable: variable.uri,
     variableInstance: variableInstance.uri,
     value: valueStr,
+    valueLabel:
+      'valueLabel' in variableInstance
+        ? variableInstance.valueLabel
+        : undefined,
     label: variable.label,
   };
   switch (variable.type) {

package/addon/plugins/roadsign-regulation-plugin/schemas/variable-instance.ts

@@ -34,6 +34,7 @@ const LocationVariableInstanceSchema = BaseVariableInstanceSchema.extend({
 
 const CodelistVariableInstanceSchema = BaseVariableInstanceSchema.extend({
   value: z.string().optional(),
+  valueLabel: z.string().optional(),
   variable: CodelistVariableSchema,
 });
 

package/addon/plugins/variable-plugin/actions/create-codelist-variable.ts

@@ -15,11 +15,22 @@ import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 
 type CreateCodelistVariableArgs = {
   schema: Schema;
+  value?: string;
+  valueLabel?: string;
 } & CreateCodelistVariableAttrsArgs;
 
 export function createCodelistVariable(args: CreateCodelistVariableArgs) {
   const { schema } = args;
   const attrs = createCodelistVariableAttrs(args);
+  if (args.value && args.valueLabel) {
+    const codelistOption = createCodelistOptionNode({
+      schema,
+      subject: args.value,
+      variableInstance: args.variableInstance,
+      text: args.valueLabel,
+    });
+    return schema.nodes.codelist.create(attrs, [codelistOption]);
+  }
   return schema.nodes.codelist.create(attrs);
 }
 
@@ -85,6 +96,7 @@ export function createCodelistOptionNode(args: CreateCodelistOptionNodeArgs) {
 type CreateCodelistOptionNodeAttrsArgs = {
   subject: string;
   text: string;
+  value?: string;
   variableInstance?: string;
 };
 

package/declarations/addon/plugins/roadsign-regulation-plugin/schemas/variable-instance.d.ts

@@ -180,6 +180,7 @@ export declare const VariableInstanceSchema: z.ZodUnion<[z.ZodObject<z.objectUti
     uri: z.ZodString;
 }, {
     value: z.ZodOptional<z.ZodString>;
+    valueLabel: z.ZodOptional<z.ZodString>;
     variable: z.ZodObject<z.objectUtil.extendShape<{
         uri: z.ZodString;
         label: z.ZodString;
@@ -214,6 +215,7 @@ export declare const VariableInstanceSchema: z.ZodUnion<[z.ZodObject<z.objectUti
         defaultValue?: string | undefined;
     };
     value?: string | undefined;
+    valueLabel?: string | undefined;
 }, {
     uri: string;
     variable: {
@@ -225,6 +227,7 @@ export declare const VariableInstanceSchema: z.ZodUnion<[z.ZodObject<z.objectUti
         defaultValue?: string | undefined;
     };
     value?: string | undefined;
+    valueLabel?: string | undefined;
 }>]>;
 export type VariableInstance = z.infer<typeof VariableInstanceSchema>;
 export declare function isVariableInstance(variableOrVariableInstance: Variable | VariableInstance): variableOrVariableInstance is VariableInstance;

package/declarations/addon/plugins/variable-plugin/actions/create-codelist-variable.d.ts

@@ -3,6 +3,8 @@ import { AllOrNone } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
 import { FullTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 type CreateCodelistVariableArgs = {
     schema: Schema;
+    value?: string;
+    valueLabel?: string;
 } & CreateCodelistVariableAttrsArgs;
 export declare function createCodelistVariable(args: CreateCodelistVariableArgs): import("prosemirror-model").Node;
 type CreateCodelistVariableAttrsArgs = {
@@ -32,6 +34,7 @@ export declare function createCodelistOptionNode(args: CreateCodelistOptionNodeA
 type CreateCodelistOptionNodeAttrsArgs = {
     subject: string;
     text: string;
+    value?: string;
     variableInstance?: string;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "34.0.2",
+  "version": "34.1.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",