@lionweb/core 0.8.0-beta.5 → 0.8.0-beta.7

package/dist/serializer.d.ts

@@ -2,6 +2,7 @@ import { LionWebJsonChunk } from "@lionweb/json";
 import { Reader } from "./reading.js";
 import { Node } from "./types.js";
 import { Property } from "./m3/types.js";
+import { LionWebVersion } from "./m3/version.js";
 /**
  * Type definition for functions that serializes nodes as a {@link LionWebJsonChunk serialization chunk}.
  */
@@ -14,6 +15,8 @@ export interface PropertyValueSerializer {
 }
 /**
  * Misspelled alias of {@link PropertyValueSerializer}, kept for backward compatibility, and to be deprecated and removed later.
+ *
+ * @deprecated Use {@link PropertyValueSerializer} instead.
  */
 export interface PrimitiveTypeSerializer extends PropertyValueSerializer {
 }
@@ -29,11 +32,14 @@ export type SerializationOptions = Partial<{
     serializeEmptyFeatures: boolean;
     /**
      * A {@link PropertyValueSerializer} implementation.
-     * Default = {@link builtinPropertyValueSerializer}.
+     * Default = the value of the `propertyValueSerializer` property of the {@link LionWebVersion version} of the LionWeb serialization format,
+     * configured through `SerializerConfiguration.lionWebVersion` (which itself defaults to `LionWebVersions.v2023_1`).
      */
     propertyValueSerializer: PropertyValueSerializer;
     /**
      * Misspelled alias of {@link #propertyValueSerializer}, kept for backward compatibility, and to be deprecated and removed later.
+     *
+     * @deprecated Use {@link propertyValueSerializer} instead.
      */
     primitiveTypeSerializer: PropertyValueSerializer;
 }>;
@@ -44,11 +50,16 @@ export type SerializationOptions = Partial<{
  * and `primitiveTypeSerializer` (which is a legacy alias for `propertyValueSerializer`)
  * properties are optional, with defined defaults.
  */
-export type SerializerConfiguration<NT extends Node> = {
+export type SerializerConfiguration<NT extends Node, RT extends Node = NT> = {
     /**
      * An interface with functions to “read” – i.e., introspect – nodes.
      */
-    reader: Reader<NT>;
+    reader: Reader<NT, RT>;
+    /**
+     * The version of the LionWeb serialization format to serialize in.
+     * Default = {@link LionWebVersions.v2023_1}.
+     */
+    lionWebVersion?: LionWebVersion;
 } & SerializationOptions;
 /**
  * @return a {@link Serializer} function that serializes the {@link Node nodes} passed to it,
@@ -57,15 +68,15 @@ export type SerializerConfiguration<NT extends Node> = {
  *
  * This is a legacy version of {@link serializerWith}, kept for backward compatibility, and to be deprecated and removed later.
  */
-export declare const nodeSerializer: <NT extends Node>(reader: Reader<NT>, serializationOptions?: SerializationOptions) => Serializer<NT>;
+export declare const nodeSerializer: <NT extends Node, RT extends Node = NT>(reader: Reader<NT, RT>, serializationOptions?: SerializationOptions) => Serializer<NT>;
 /**
  * @return a {@link Serializer} function that serializes the {@link Node nodes} passed to it,
  * configured through a `configuration` {@link SerializerConfiguration} object.
  */
-export declare const serializerWith: <NT extends Node>(configuration: SerializerConfiguration<NT>) => Serializer<NT>;
+export declare const serializerWith: <NT extends Node, RT extends Node = NT>(configuration: SerializerConfiguration<NT, RT>) => Serializer<NT>;
 /**
  * @return a {@link LionWebJsonChunk} of the given model (i.e., an array of {@link Node nodes} - the first argument) to the LionWeb serialization JSON format.
  *  *Note:* this function will be deprecated and removed later — use {@link nodeSerializer} instead.
  */
-export declare const serializeNodes: <NT extends Node>(nodes: NT[], reader: Reader<NT>, propertyValueSerializerOrOptions?: PropertyValueSerializer | SerializationOptions) => LionWebJsonChunk;
+export declare const serializeNodes: <NT extends Node, RT extends Node = NT>(nodes: NT[], reader: Reader<NT, RT>, propertyValueSerializerOrOptions?: PropertyValueSerializer | SerializationOptions) => LionWebJsonChunk;
 //# sourceMappingURL=serializer.d.ts.map

package/dist/serializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../src/serializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,gBAAgB,EAAmB,MAAM,eAAe,CAAA;AAG/G,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAGjC,OAAO,EAOH,QAAQ,EAGX,MAAM,eAAe,CAAA;AAGtB;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,EAAE,SAAS,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,gBAAgB,CAAA;AAG3E;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACpC,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAA;CACpE;AAED;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,uBAAuB;CAAG;AAQ3E;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC;IAEvC;;;;OAIG;IACH,sBAAsB,EAAE,OAAO,CAAA;IAE/B;;;OAGG;IACH,uBAAuB,EAAE,uBAAuB,CAAA;IAEhD;;OAEG;IACH,uBAAuB,EAAE,uBAAuB,CAAA;CAEnD,CAAC,CAAA;AAGF;;;;;;GAMG;AACH,MAAM,MAAM,uBAAuB,CAAC,EAAE,SAAS,IAAI,IAAI;IACnD;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAA;CACrB,GAAG,oBAAoB,CAAA;AAGxB;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAAI,EAAE,SAAS,IAAI,EAAE,QAAQ,MAAM,CAAC,EAAE,CAAC,EAAE,uBAAuB,oBAAoB,KAAG,UAAU,CAAC,EAAE,CACxE,CAAA;AAGvD;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,EAAE,SAAS,IAAI,EAAE,eAAe,uBAAuB,CAAC,EAAE,CAAC,KAAG,UAAU,CAAC,EAAE,CA4IzG,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,EAAE,SAAS,IAAI,EAC1C,OAAO,EAAE,EAAE,EACX,QAAQ,MAAM,CAAC,EAAE,CAAC,EAClB,mCAAmC,uBAAuB,GAAG,oBAAoB,KAClF,gBAQS,CAAA"}
+{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../src/serializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,gBAAgB,EAAmB,MAAM,eAAe,CAAA;AAG5E,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,OAAO,EAOH,QAAQ,EAGX,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAIhD;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,EAAE,SAAS,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,gBAAgB,CAAA;AAG3E;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACpC,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAA;CACpE;AAED;;;;GAIG;AACH,MAAM,WAAW,uBAAwB,SAAQ,uBAAuB;CAAG;AAQ3E;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC;IAEvC;;;;OAIG;IACH,sBAAsB,EAAE,OAAO,CAAA;IAE/B;;;;OAIG;IACH,uBAAuB,EAAE,uBAAuB,CAAA;IAEhD;;;;OAIG;IACH,uBAAuB,EAAE,uBAAuB,CAAA;CAEnD,CAAC,CAAA;AAGF;;;;;;GAMG;AACH,MAAM,MAAM,uBAAuB,CAAC,EAAE,SAAS,IAAI,EAAE,EAAE,SAAS,IAAI,GAAG,EAAE,IAAI;IACzE;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IAEtB;;;OAGG;IACH,cAAc,CAAC,EAAE,cAAc,CAAA;CAClC,GAAG,oBAAoB,CAAA;AAGxB;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAAI,EAAE,SAAS,IAAI,EAAE,EAAE,SAAS,IAAI,GAAG,EAAE,EAAE,QAAQ,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,uBAAuB,oBAAoB,KAAG,UAAU,CAAC,EAAE,CAClG,CAAA;AAGvD;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,EAAE,SAAS,IAAI,EAAE,EAAE,SAAS,IAAI,GAAG,EAAE,EAAE,eAAe,uBAAuB,CAAC,EAAE,EAAE,EAAE,CAAC,KAAG,UAAU,CAAC,EAAE,CA4InI,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,EAAE,SAAS,IAAI,EAAE,EAAE,SAAS,IAAI,GAAG,EAAE,EAChE,OAAO,EAAE,EAAE,EACX,QAAQ,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,EACtB,mCAAmC,uBAAuB,GAAG,oBAAoB,KAClF,gBAQS,CAAA"}

package/dist/serializer.js

@@ -1,9 +1,8 @@
-import { currentSerializationFormatVersion } from "@lionweb/json";
 import { asArray, keepDefineds, lazyMapGet, uniquesAmong } from "@lionweb/ts-utils";
 import { asIds, metaPointerFor } from "./functions.js";
-import { builtinPropertyValueSerializer } from "./m3/builtins.js";
 import { inheritsDirectlyFrom } from "./m3/functions.js";
 import { Containment, Enumeration, PrimitiveType, Property, Reference, simpleNameDeducer } from "./m3/types.js";
+import { LionWebVersions } from "./m3/versions.js";
 const isPropertyValueSerializer = (value) => typeof value === "object" && value !== null && "serializeValue" in value && typeof value.serializeValue === "function";
 /**
  * @return a {@link Serializer} function that serializes the {@link Node nodes} passed to it,
@@ -19,7 +18,8 @@ export const nodeSerializer = (reader, serializationOptions) => serializerWith({
  */
 export const serializerWith = (configuration) => {
     const { reader } = configuration;
-    const propertyValueSerializer = configuration.propertyValueSerializer ?? configuration.primitiveTypeSerializer ?? builtinPropertyValueSerializer;
+    const lionWebVersion = configuration?.lionWebVersion ?? LionWebVersions.v2023_1;
+    const propertyValueSerializer = configuration.propertyValueSerializer ?? configuration.primitiveTypeSerializer ?? lionWebVersion.builtinsFacade.propertyValueSerializer;
     const serializeEmptyFeatures = configuration.serializeEmptyFeatures ?? true;
     const languageKey2version2classifierKey2allFeatures = {};
     const memoisedAllFeaturesOf = (classifier) => lazyMapGet(lazyMapGet(lazyMapGet(languageKey2version2classifierKey2allFeatures, classifier.language.key, () => ({})), classifier.language.version, () => ({})), classifier.key, () => uniquesAmong(// make unique in case a feature was inherited from multiple super-classifiers
@@ -113,7 +113,6 @@ export const serializerWith = (configuration) => {
                     serializedNode.references.push({
                         reference: featureMetaPointer,
                         targets: keepDefineds(targets) // (skip "non-connected" targets)
-                            .map(t => t)
                             .map(t => ({
                             resolveInfo: (reader.resolveInfoFor ? reader.resolveInfoFor(t, feature) : simpleNameDeducer(t, feature)) ?? null,
                             reference: t.id
@@ -129,7 +128,7 @@ export const serializerWith = (configuration) => {
         };
         nodes.forEach(node => visit(node, undefined));
         return {
-            serializationFormatVersion: currentSerializationFormatVersion,
+            serializationFormatVersion: lionWebVersion.serializationFormatVersion,
             languages: languagesUsed.map(({ key, version }) => ({ key, version })),
             nodes: serializedNodes
         };

package/dist/serializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../src/serializer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../src/serializer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAc,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAC/F,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAGtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAEH,WAAW,EACX,WAAW,EAGX,aAAa,EACb,QAAQ,EACR,SAAS,EACT,iBAAiB,EACpB,MAAM,eAAe,CAAA;AAEtB,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAwBlD,MAAM,yBAAyB,GAAG,CAAC,KAAc,EAAoC,EAAE,CACnF,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,gBAAgB,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,cAAc,KAAK,UAAU,CAAA;AAsD1H;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAwC,MAAsB,EAAE,oBAA2C,EAAkB,EAAE,CACzJ,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,oBAAoB,EAAE,CAAC,CAAA;AAGvD;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAwC,aAA8C,EAAkB,EAAE;IACpI,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAA;IAChC,MAAM,cAAc,GAAG,aAAa,EAAE,cAAc,IAAI,eAAe,CAAC,OAAO,CAAA;IAC/E,MAAM,uBAAuB,GACzB,aAAa,CAAC,uBAAuB,IAAI,aAAa,CAAC,uBAAuB,IAAI,cAAc,CAAC,cAAc,CAAC,uBAAuB,CAAA;IAC3I,MAAM,sBAAsB,GAAG,aAAa,CAAC,sBAAsB,IAAI,IAAI,CAAA;IAE3E,MAAM,6CAA6C,GAA0B,EAAE,CAAA;IAC/E,MAAM,qBAAqB,GAAG,CAAC,UAAsB,EAAa,EAAE,CAChE,UAAU,CACN,UAAU,CACN,UAAU,CACN,6CAA6C,EAC7C,UAAU,CAAC,QAAQ,CAAC,GAAG,EACvB,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CACb,EACD,UAAU,CAAC,QAAQ,CAAC,OAAO,EAC3B,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CACb,EACD,UAAU,CAAC,GAAG,EACd,GAAG,EAAE,CAAC,YAAY,CAAE,8EAA8E;IAC9F,CAAE,GAAG,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAE;IAChG;;;;;OAKG;KACN,CACJ,CAAA;IAEL,OAAO,CAAC,KAAW,EAAoB,EAAE;QACrC,MAAM,eAAe,GAAsB,EAAE,CAAA,CAAC,4CAA4C;QAC1F,MAAM,GAAG,GAAiC,EAAE,CAAA,CAAC,yEAAyE;QACtH,MAAM,aAAa,GAAe,EAAE,CAAA;QACpC,MAAM,+BAA+B,GAAsD,EAAE,CAAA;QAC7F,MAAM,oBAAoB,GAAG,CAAC,QAAkB,EAAE,EAAE;YAChD,MAAM,eAAe,GAAG,UAAU,CAAiC,+BAA+B,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAC7H,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrC,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;gBACxC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAChC,CAAC;QACL,CAAC,CAAA;QAED,MAAM,KAAK,GAAG,CAAC,IAAQ,EAAE,MAAW,EAAE,EAAE;YACpC,IAAI,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC;gBACjB,OAAM;YACV,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;YAC5C,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;YACpC,oBAAoB,CAAC,QAAQ,CAAC,CAAA;YAC9B,MAAM,cAAc,GAAoB;gBACpC,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE;gBACpC,UAAU,EAAE,EAAE;gBACd,YAAY,EAAE,EAAE;gBAChB,UAAU,EAAE,EAAE;gBACd,WAAW,EAAE,EAAE;gBACf,MAAM,EAAE,IAAI;aACf,CAAA;YACD,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;YACpC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;YACnB,qBAAqB,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAClD,MAAM,KAAK,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;gBACnD,MAAM,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAA;gBACnD,oBAAoB,CAAC,eAAe,CAAC,CAAA;gBACrC,MAAM,kBAAkB,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;gBAClD,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;oBAC9B,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,sBAAsB,EAAE,CAAC;wBACjD,0GAA0G;wBAC1G,OAAM;oBACV,CAAC;oBACD,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;wBACvB,2CAA2C;wBAC3C,IAAI,OAAO,CAAC,IAAI,YAAY,aAAa,EAAE,CAAC;4BACxC,OAAO,uBAAuB,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;wBACjE,CAAC;wBACD,IAAI,OAAO,CAAC,IAAI,YAAY,WAAW,EAAE,CAAC;4BACtC,OAAO,MAAM,CAAC,sBAAsB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAA;wBAClE,CAAC;wBACD,OAAO,SAAS,CAAA;oBACpB,CAAC,CAAC,EAAE,CAAA;oBACJ,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC;wBAC3B,QAAQ,EAAE,kBAAkB;wBAC5B,KAAK,EAAG,YAAuB,IAAI,IAAI,CAAC,sBAAsB;qBACjE,CAAC,CAAA;oBACF,OAAM;gBACV,CAAC;gBACD,IAAI,OAAO,YAAY,WAAW,EAAE,CAAC;oBACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAkB,CAAA;oBAChD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;wBACnD,OAAM;oBACV,CAAC;oBACD,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC;wBAC7B,WAAW,EAAE,kBAAkB;wBAC/B,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;6BAClC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAiB,CAAC;qBACzC,CAAC,CAAA;oBACF,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;wBAC3B,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;4BACvB,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;wBAC5B,CAAC;oBACL,CAAC,CAAC,CAAA;oBACF,OAAM;gBACV,CAAC;gBACD,IAAI,OAAO,YAAY,SAAS,EAAE,CAAC;oBAC/B,qHAAqH;oBACrH,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAkB,CAAA;oBAC/C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;wBAClD,OAAM;oBACV,CAAC;oBACD,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC;wBAC3B,SAAS,EAAE,kBAAkB;wBAC7B,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,iCAAiC;6BAC3D,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;4BACP,WAAW,EACP,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,IAAI;4BACvG,SAAS,EAAE,CAAC,CAAC,EAAE;yBAClB,CAAC,CAAC;qBACV,CAAC,CAAA;oBACF,OAAM;gBACV,CAAC;YACL,CAAC,CAAC,CAAA;YAEF,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAS,CAAA,CAAC,+EAA+E;YACrI,cAAc,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;YACzE,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAA;YAE1D,cAAc,CAAC,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,IAAI,CAAA,CAAC,sBAAsB;QACrE,CAAC,CAAA;QAED,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAA;QAE7C,OAAO;YACH,0BAA0B,EAAE,cAAc,CAAC,0BAA0B;YACrE,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;YACtE,KAAK,EAAE,eAAe;SACzB,CAAA;IACL,CAAC,CAAA;AACL,CAAC,CAAA;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC1B,KAAW,EACX,MAAsB,EACtB,gCAAiF,EACjE,EAAE,CAClB,cAAc,CACV,MAAM,EACN,yBAAyB,CAAC,gCAAgC,CAAC;IACvD,CAAC,CAAC;QACE,uBAAuB,EAAE,gCAAgC;KAC5D;IACD,CAAC,CAAC,gCAAgC,CACzC,CAAC,KAAK,CAAC,CAAA"}

package/dist/writing.d.ts

@@ -19,7 +19,7 @@ export interface Writer<NT extends Node, PNT extends Node = NT> {
     }) => NT;
     /**
      * Sets the *single* given value of the indicated {@link Feature} on the given node.
-     * This means adding it in case the feature is multi-valued, meaning it is a {@link Link} with {@code multiple = true}.
+     * This means adding it in case the feature is multi-valued, meaning it is a {@link Link} with `multiple = true`.
      */
     setFeatureValue: (node: NT, feature: Feature, value: unknown) => void;
     /**
@@ -29,6 +29,8 @@ export interface Writer<NT extends Node, PNT extends Node = NT> {
 }
 /**
  * Alias for {@link Writer}, kept for backward compatibility, and to be deprecated and removed later.
+ *
+ * @deprecated Use {@link Writer} instead.
  */
 export interface InstantiationFacade<NT extends Node, PNT extends Node = NT> extends Writer<NT, PNT> {
 }

package/dist/writing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writing.d.ts","sourceRoot":"","sources":["../src/writing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAErD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,OAAO,EAAQ,MAAM,eAAe,CAAA;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAGjC;;;;;;GAMG;AACH,MAAM,WAAW,MAAM,CAAC,EAAE,SAAS,IAAI,EAAE,GAAG,SAAS,IAAI,GAAG,EAAE;IAE1D;;;;OAIG;IACH,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE;QAAE,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAA;KAAE,KAAK,EAAE,CAAA;IAGzI;;;OAGG;IACH,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IAGrE;;OAEG;IACH,UAAU,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAA;CAEvD;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB,CAAC,EAAE,SAAS,IAAI,EAAE,GAAG,SAAS,IAAI,GAAG,EAAE,CAAE,SAAQ,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC;CAAG;AAGvG;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;AAqB3G;;;GAGG;AACH,eAAO,MAAM,uBAAuB,EAAE,eAAyC,CAAA;AAE/E;;;GAGG;AACH,eAAO,MAAM,sBAAsB,iBAAyB,CAAA"}
+{"version":3,"file":"writing.d.ts","sourceRoot":"","sources":["../src/writing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAErD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,OAAO,EAAQ,MAAM,eAAe,CAAA;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAGjC;;;;;;GAMG;AACH,MAAM,WAAW,MAAM,CAAC,EAAE,SAAS,IAAI,EAAE,GAAG,SAAS,IAAI,GAAG,EAAE;IAE1D;;;;OAIG;IACH,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE;QAAE,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAA;KAAE,KAAK,EAAE,CAAA;IAGzI;;;OAGG;IACH,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IAGrE;;OAEG;IACH,UAAU,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAA;CAEvD;AAED;;;;GAIG;AACH,MAAM,WAAW,mBAAmB,CAAC,EAAE,SAAS,IAAI,EAAE,GAAG,SAAS,IAAI,GAAG,EAAE,CAAE,SAAQ,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC;CAAG;AAGvG;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;AAqB3G;;;GAGG;AACH,eAAO,MAAM,uBAAuB,EAAE,eAAyC,CAAA;AAE/E;;;GAGG;AACH,eAAO,MAAM,sBAAsB,iBAAyB,CAAA"}

package/dist/writing.js.map

@@ -1 +1 @@
-{"version":3,"file":"writing.js","sourceRoot":"","sources":["../src/writing.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2C,IAAI,EAAE,MAAM,eAAe,CAAA;AA8C7E;;;;GAIG;AACH,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAmB,EAAE,CAChE,CAAC,QAAiC,EAAE,OAAgB,EAAE,KAAc,EAAQ,EAAE;IAClF,8DAA8D;IACtD,MAAM,GAAG,GAAI,OAAe,CAAC,OAAO,CAAW,CAAA;IAC/C,IAAI,OAAO,YAAY,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC9C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAChC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;QACtB,CAAC;QACA,QAAQ,CAAC,GAAG,CAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC5C,CAAC;SAAM,CAAC;QACJ,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IACzB,CAAC;AACL,CAAC,CAAA;AAEL;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAoB,eAAe,CAAC,MAAM,CAAC,CAAA;AAE/E;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA"}
+{"version":3,"file":"writing.js","sourceRoot":"","sources":["../src/writing.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2C,IAAI,EAAE,MAAM,eAAe,CAAA;AAgD7E;;;;GAIG;AACH,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAmB,EAAE,CAChE,CAAC,QAAiC,EAAE,OAAgB,EAAE,KAAc,EAAQ,EAAE;IAClF,8DAA8D;IACtD,MAAM,GAAG,GAAI,OAAe,CAAC,OAAO,CAAW,CAAA;IAC/C,IAAI,OAAO,YAAY,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC9C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAChC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;QACtB,CAAC;QACA,QAAQ,CAAC,GAAG,CAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC5C,CAAC;SAAM,CAAC;QACJ,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IACzB,CAAC;AACL,CAAC,CAAA;AAEL;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAoB,eAAe,CAAC,MAAM,CAAC,CAAA;AAE/E;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lionweb/core",
-    "version": "0.8.0-beta.5",
+    "version": "0.8.0-beta.7",
     "description": "LionWeb core for {Java|Type}Script",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
         "release": "npm publish"
     },
     "dependencies": {
-        "@lionweb/json": "0.8.0-beta.5",
-        "@lionweb/ts-utils": "0.8.0-beta.5"
+        "@lionweb/json": "0.8.0-beta.7",
+        "@lionweb/ts-utils": "0.8.0-beta.7"
     }
 }

package/src/deserializer.ts

@@ -1,16 +1,11 @@
-import {
-    currentSerializationFormatVersion,
-    LionWebId,
-    LionWebJsonChunk,
-    LionWebJsonNode,
-    LionWebKey
-} from "@lionweb/json"
+import { LionWebId, LionWebJsonChunk, LionWebJsonNode, LionWebKey } from "@lionweb/json"
 import { byIdMap, groupBy, keepDefineds } from "@lionweb/ts-utils"
 import { Writer } from "./writing.js"
 import { consoleProblemReporter, ProblemReporter } from "./reporter.js"
-import { builtinPropertyValueDeserializer } from "./m3/builtins.js"
 import { MemoisingSymbolTable } from "./m3/symbol-table.js"
 import { Classifier, Containment, Enumeration, Language, PrimitiveType, Property, Reference } from "./m3/types.js"
+import { LionWebVersion } from "./m3/version.js"
+import { LionWebVersions } from "./m3/versions.js"
 import { unresolved } from "./references.js"
 import { Node } from "./types.js"
 
@@ -23,6 +18,8 @@ export interface PropertyValueDeserializer {
 
 /**
  * Misspelled alias of {@link PropertyValueDeserializer}, kept for backward compatibility, and to be deprecated and removed later.
+ *
+ * @deprecated Use {@link PropertyValueDeserializer} instead.
  */
 export interface PrimitiveTypeDeserializer extends PropertyValueDeserializer {}
 
@@ -43,13 +40,18 @@ export type DeserializerConfiguration<NT extends Node> = {
      * A {@link Writer} that is used to instantiate nodes (with classifiers coming from the `languages` property) and set values on them.
      */
     writer: Writer<NT>,
+    /**
+     * The version of the LionWeb serialization format to deserialize from.
+     * Default = {@link LionWebVersions.v2023_1}.
+     */
+    lionWebVersion?: LionWebVersion
     /**
      * An array of {@link Language languages} that the serialization chunk is expected to conform to.
      */
     languages: Language[],
     /**
      * A deserializer for values of properties.
-     * Default: {@link builtinPropertyValueDeserializer}.
+     * Default: `(lionWebVersion ?? LionWebVersions.v2023_1).builtinsFacade.propertyValueDeserializer`.
      */
     propertyValueDeserializer?: PropertyValueDeserializer,
     /**
@@ -70,14 +72,16 @@ export const deserializerWith = <NT extends Node>(configuration: DeserializerCon
     const symbolTable = new MemoisingSymbolTable(configuration.languages)
     const { writer } = configuration
 
-    const propertyValueDeserializer = configuration.propertyValueDeserializer ?? builtinPropertyValueDeserializer
+    const lionWebVersion = configuration?.lionWebVersion ?? LionWebVersions.v2023_1
+    const propertyValueDeserializer = configuration.propertyValueDeserializer ?? lionWebVersion.builtinsFacade.propertyValueDeserializer
     const problemReporter = configuration.problemReporter ?? consoleProblemReporter
 
     return (serializationChunk, dependentNodes = []) => {
 
-        if (serializationChunk.serializationFormatVersion !== currentSerializationFormatVersion) {
+        const serializationFormatVersion = lionWebVersion.serializationFormatVersion
+        if (serializationChunk.serializationFormatVersion !== serializationFormatVersion) {
             problemReporter.reportProblem(
-                `can't deserialize from serialization format other than version "${currentSerializationFormatVersion}" - assuming that version`
+                `can't deserialize from serialization format other than version "${serializationFormatVersion}" - assuming that version`
             )
         }
 
@@ -260,7 +264,7 @@ export const deserializerWith = <NT extends Node>(configuration: DeserializerCon
  * @param writer - a {@link Writer} that is used to instantiate nodes and set values on them
  * @param languages - {@link Language languages} that the serialized model is expected to conform to
  * @param dependentNodes - a collection of nodes from dependent models against which all references in the serialized model are supposed to resolve against
- * @param propertyValueDeserializer - a deserializer for values of properties (by default a {@link BuiltinPropertyValueDeserializer})
+ * @param propertyValueDeserializer - a deserializer for values of properties (by default `LionWebVersions.v2023_1.builtinsFacade.propertyValueDeserializer`)
  * @param problemReporter - an object for reporting problems (by default a {@link consoleProblemReporter})
  *
  * This is a legacy variant of {@link deserializerWith}, kept for backward compatibility, and to be deprecated and removed later.
@@ -272,7 +276,7 @@ export const deserializeSerializationChunk = <NT extends Node>(
     // TODO  facades <--> languages, so it's weird that it looks split up like this
     dependentNodes: Node[],
     // TODO (#13)  see if you can turn this into [nodes: Node[], writer: Writer<Node>][] after all
-    propertyValueDeserializer: PropertyValueDeserializer = builtinPropertyValueDeserializer,
+    propertyValueDeserializer: PropertyValueDeserializer = LionWebVersions.v2023_1.builtinsFacade.propertyValueDeserializer,
     problemReporter: ProblemReporter = consoleProblemReporter
 ): NT[] => deserializerWith({ writer, languages, propertyValueDeserializer, problemReporter: problemReporter })(serializationChunk, dependentNodes)
 

package/src/dynamic-facade.ts

@@ -1,6 +1,5 @@
 import { LionWebKey } from "@lionweb/json"
-import { builtinFeatures } from "./m3/builtins.js"
-import { Classifier } from "./m3/types.js"
+import { Classifier, LionWebVersions } from "./m3/index.js"
 import { Reader, ResolveInfoDeducer } from "./reading.js"
 import { Node } from "./types.js"
 import { updateSettingsKeyBased, Writer } from "./writing.js"
@@ -19,7 +18,7 @@ export type DynamicNode = Node & {
 const propertyGetterFor = (key: LionWebKey): ResolveInfoDeducer<DynamicNode> =>
     (node) =>
         (key in node.settings && typeof node.settings[key] === "string")
-            ? node.settings[key] as string  // FIXME  type cast shouldn't be necessary
+            ? node.settings[key] as string
             : undefined
 
 /**
@@ -33,7 +32,8 @@ export const dynamicReader: Reader<DynamicNode> = ({
     enumerationLiteralFrom: (value, enumeration) =>
         enumeration.literals.find(({key}) => key === value)
         ?? null,    // (undefined -> null)
-    resolveInfoFor: propertyGetterFor(builtinFeatures.inamed_name.key)
+    resolveInfoFor: propertyGetterFor(LionWebVersions.v2023_1.builtinsFacade.features.inamed_name.key)
+        // TODO  have this parametrized in the LionWeb version, instead of relying on keys not changing between versions
 })
 
 /**

package/src/extraction.ts

@@ -13,7 +13,7 @@ export type NodesExtractor<NT extends Node> = (node: NT) => NT[]
 /**
  * @return A function that extracts the children from a given node.
  */
-export const childrenExtractorUsing = <NT extends Node>(reader: Reader<NT>): NodesExtractor<NT> =>
+export const childrenExtractorUsing = <NT extends Node, RT extends Node = NT>(reader: Reader<NT, RT>): NodesExtractor<NT> =>
     (node: NT): NT[] => [
         ...(allFeaturesOf(reader.classifierOf(node))
             .filter(isContainment)
@@ -26,6 +26,6 @@ export const childrenExtractorUsing = <NT extends Node>(reader: Reader<NT>): Nod
 /**
  * @return a function that extracts *all* nodes from a given start node - usually a root node.
  */
-export const nodesExtractorUsing = <NT extends Node>(reader: Reader<NT>): NodesExtractor<NT> =>
-    flatMapNonCyclingFollowing(trivialFlatMapper, childrenExtractorUsing<NT>(reader))
+export const nodesExtractorUsing = <NT extends Node, RT extends Node = NT>(reader: Reader<NT, RT>): NodesExtractor<NT> =>
+    flatMapNonCyclingFollowing(trivialFlatMapper, childrenExtractorUsing<NT, RT>(reader))
 

package/src/index.ts

@@ -7,7 +7,6 @@ export * from "./references.js"
 export * from "./reporter.js"
 export * from "./serializer.js"
 export * from "./types.js"
-export * from "./version.js"
 export * from "./writing.js"
 export * from "./m1/reference-utils.js"
 export * from "./m3/index.js"

package/src/m1/reference-utils.ts

@@ -29,9 +29,9 @@ export class ReferenceValue<NT extends Node> {
  * @param reader - a {@link Reader} to reflect on nodes.
  * _Note_ that it's assumed that its {@link getFeatureValue} function doesn't throw.
  */
-export const referenceValues = <NT extends Node>(
+export const referenceValues = <NT extends Node, RT extends Node = NT>(
     scope: NT[],
-    reader: Reader<NT>
+    reader: Reader<NT, RT>
 ): ReferenceValue<NT>[] => {
     const visit = (sourceNode: NT, reference: Reference): ReferenceValue<NT>[] => {
         if (reference.multiple) {
@@ -74,10 +74,10 @@ export const referenceValues = <NT extends Node>(
  * @param reader - a {@link Reader} to reflect on nodes.
  * _Note_ that it's assumed that its {@link getFeatureValue} function doesn't throw.
  */
-export const incomingReferences = <NT extends Node>(
+export const incomingReferences = <NT extends Node, RT extends Node = NT>(
     targetNodeOrNodes: NT[] | NT,
     scope: NT[],
-    reader: Reader<NT>
+    reader: Reader<NT, RT>
 ): ReferenceValue<NT>[] => {
     const targetNodes = Array.isArray(targetNodeOrNodes) ? targetNodeOrNodes : [targetNodeOrNodes]
     return referenceValues(scope, reader)
@@ -97,9 +97,9 @@ export const incomingReferences = <NT extends Node>(
  * @param reader - a {@link Reader} to reflect on nodes.
  * _Note_ that it's assumed that its {@link getFeatureValue} function doesn't throw.
  */
-export const referencesToOutOfScopeNodes = <NT extends Node>(
+export const referencesToOutOfScopeNodes = <NT extends Node, RT extends Node = NT>(
     scope: NT[],
-    reader: Reader<NT>
+    reader: Reader<NT, RT>
 ): ReferenceValue<NT>[] =>
     referenceValues(scope, reader)
         .filter((referenceValue) => scope.indexOf(referenceValue.targetNode) === -1)

package/src/m3/README.md

@@ -6,7 +6,7 @@
 * [TypeScript type definitions](./types.ts)
 * [Factory](./factory.ts) for conveniently creating M3 instances
 * [Classifiers built in (`LionCore-builtins`) to LionCore](./builtins.ts)
-* [Facades specific for M3 instances](./facade.ts)
+* [A reader and writer specific for M3 instances](reading-writing.ts)
 * Persistence: [serializer](./serializer.ts) and [deserializer](./deserializer.ts)
 * [Constraints checker](./constraints.ts)
 * Convenience/helper [functions](./functions.ts) defined on M3 concepts

package/src/m3/builtins-common.ts

@@ -0,0 +1,143 @@
+import { StringsMapper } from "@lionweb/ts-utils"
+import { PropertyValueDeserializer } from "../deserializer.js"
+import { Concept, DataType, Interface, Language, PrimitiveType, Property } from "./types.js"
+import { isUnresolvedReference } from "../references.js"
+import { PropertyValueSerializer } from "../serializer.js"
+
+
+/**
+ * Determines whether two data types should be structurally equal based on equality of: meta type, key, and language's key.
+ */
+export const shouldBeIdentical = (left: DataType, right: DataType): boolean =>
+    left.key === right.key && left.language.key === right.language.key && left.metaType() === right.metaType()
+
+
+const lookupFrom = <T>(registry: Map<DataType, T>) =>
+    (targetDataType: DataType) => {
+        for (const [dataType, t] of registry.entries()) {
+            if (shouldBeIdentical(targetDataType, dataType)) {
+                return t
+            }
+        }
+        return undefined
+    }
+
+
+/**
+ * Type def. for functions that deserialize the value of a property of a specific type.
+ */
+export type PropertyValueDeserializerFunction = (value: string) => unknown
+
+/**
+ * @return an empty registry for populating fluently using
+ * `.set(<data type>, <deserializer function>)`,
+ * to pass to {@link propertyValueDeserializerFrom}.
+ */
+export const newPropertyValueDeserializerRegistry = () => new Map<DataType, PropertyValueDeserializerFunction>
+
+/**
+ * @return an instance of a {@link PropertyValueDeserializer} entirely driven by the passed `registry`.
+ */
+export const propertyValueDeserializerFrom = (registry: Map<DataType, PropertyValueDeserializerFunction>): PropertyValueDeserializer => {
+    const byType = lookupFrom(registry)
+    return {
+        deserializeValue: (value: string | undefined, property: Property): unknown | undefined => {
+            if (value === undefined) {
+                if (property.optional) {
+                    return undefined
+                }
+                throw new Error(`can't deserialize undefined as the value of required property "${property.name}" (on classifier "${property.classifier.name}" in language "${property.classifier.language.name}")`)
+            }
+            const { type } = property
+            if (isUnresolvedReference(type)) {
+                throw new Error(`can't deserialize property "${property.name}" (on classifier "${property.classifier.name}" in language "${property.classifier.language.name}") with unspecified type`)
+            }
+            const specificDeserializer = byType(type)
+            if (specificDeserializer != undefined) {
+                return specificDeserializer(value)
+            } else {
+                throw new Error(`can't deserialize value of property "${property.name}" (on classifier "${property.classifier.name}" in language "${property.classifier.language.name}") of type "${type!.name}": ${value}`)
+            }
+        }
+    }
+}
+
+
+/**
+ * Type def. for functions that serialize the value of a property of a specific type.
+ */
+export type PropertyValueSerializerFunction = (value: unknown) => string
+
+/**
+ * @return an empty registry for populating fluently using
+ * `.set(<data type>, <serializer function>)`,
+ * to pass to {@link propertyValueSerializerFrom}.
+ */
+export const newPropertyValueSerializerRegistry = () => new Map<DataType, PropertyValueSerializerFunction>
+
+/**
+ * @return an instance of a {@link PropertyValueSerializer} entirely driven by the passed `registry`.
+ */
+export const propertyValueSerializerFrom = (registry: Map<DataType, PropertyValueSerializerFunction>): PropertyValueSerializer => {
+    const byType = lookupFrom(registry)
+    return {
+        serializeValue: (value: unknown | undefined, property: Property): string | null => {
+            if (value === undefined) {
+                if (property.optional) {
+                    return null
+                }
+                throw new Error(`can't serialize undefined as the value of required property "${property.name}" (on classifier "${property.classifier.name}" in language "${property.classifier.language.name}")`)
+            }
+            const { type } = property
+            if (isUnresolvedReference(type)) {
+                throw new Error(`can't serialize property "${property.name}" (on classifier "${property.classifier.name}" in language "${property.classifier.language.name}") with unspecified type`)
+            }
+            const specificSerializer = byType(type)
+            if (specificSerializer != undefined) {
+                return specificSerializer(value)
+            } else {
+                throw new Error(`can't serialize value of property "${property.name}" (on classifier "${property.classifier.name}" in language "${property.classifier.language.name}") of type "${type!.name}": ${value}`)
+            }
+        }
+    }
+}
+
+
+/**
+ * The key of the LionCore language containing the built-ins.
+ */
+export const lioncoreBuiltinsKey = "LionCore-builtins"
+
+/**
+ * A function that generates IDs and keys for entities in the LionCore built-ins language.
+ */
+export const lioncoreBuiltinsIdAndKeyGenerator: StringsMapper = (...names) =>
+    [lioncoreBuiltinsKey, ...names.slice(1)].join("-")
+
+
+/**
+ * Type def. for objects that façade (a version of) the LionCore built-ins.
+ */
+export type LionCoreBuiltinsFacade = {
+    language: Language
+    /** The default {@link PropertyValueDeserializer}. */
+    propertyValueDeserializer: PropertyValueDeserializer
+    /** The default {@link PropertyValueSerializer}. */
+    propertyValueSerializer: PropertyValueSerializer
+    classifiers: {
+        node: Concept
+        inamed: Interface
+    }
+    features: {
+        inamed_name: Property
+    }
+    /**
+     * The built-in primitive types: boolean, integer, string + legacy (in the `Record<...>` part).
+     */
+    primitiveTypes: {
+        booleanDataType: PrimitiveType
+        integerDataType: PrimitiveType
+        stringDataType: PrimitiveType
+    } & Record<string, PrimitiveType>
+}
+

package/src/m3/builtins-function.ts

@@ -0,0 +1,22 @@
+import { Classifier, Concept } from "./types.js"
+import { LionWebVersion } from "./version.js"
+import { LionWebVersions } from "./versions.js"
+
+/**
+ * @return whether the given {@link Classifier} is the built-in `Node` {@link Concept}
+ * of *any* version of the LionCore builtins language,
+ * or of the version belonging to the designated {@link LionWebVersion}.
+ */
+export const isBuiltinNodeConcept = (classifier: Classifier, lionWebVersion?: LionWebVersion): boolean => {
+    const { builtinsFacade } = lionWebVersion ?? LionWebVersions.v2023_1
+    return classifier instanceof Concept
+        && (classifier as Concept).abstract
+        && classifier.language.key === builtinsFacade.language.key
+        && (lionWebVersion === undefined || classifier.language.version === builtinsFacade.language.version)
+        && classifier.key === builtinsFacade.classifiers.node.key
+}
+
+/*
+ * NOTE: this function has to be defined in a separate file to avoid circular loading dependencies!
+ */
+

package/src/m3/deserializer.ts

@@ -2,10 +2,43 @@ import { LionWebJsonChunk } from "@lionweb/json"
 import { deserializerWith } from "../deserializer.js"
 import { nodesExtractorUsing } from "../extraction.js"
 import { consoleProblemReporter, ProblemReporter } from "../reporter.js"
-import { lioncoreBuiltins } from "./builtins.js"
-import { lioncoreReader, lioncoreWriter } from "./facade.js"
-import { lioncore } from "./lioncore.js"
+import { lioncoreReaderFor, lioncoreWriterFor } from "./reading-writing.js"
 import { Language } from "./types.js"
+import { LionWebVersion } from "./version.js"
+import { LionWebVersions } from "./versions.js"
+
+
+/**
+ * Type def. for objects that contain all necessary data to deserialize one or more languages from a {@link LionWebJsonChunk serialization chunk}.
+ */
+export type LanguageDeserializationData = {
+    serializationChunk: LionWebJsonChunk
+    /**
+     * The version of the LionWeb serialization format to deserialize from.
+     * Default = {@link LionWebVersions.v2023_1}.
+     */
+    lionWebVersion?: LionWebVersion
+    dependentLanguages?: Language[]
+    /**
+     * Default = {@link consoleProblemReporter}.
+     */
+    problemReporter?: ProblemReporter
+}
+
+/**
+ * @return languages serialized to the {@link LionWebJsonChunk serialization chunk} passed in the {@link LanguageDeserializationData data object}.
+ */
+export const deserializeLanguagesFrom = ({serializationChunk, dependentLanguages, problemReporter, lionWebVersion = LionWebVersions.v2023_1}: LanguageDeserializationData): Language[] =>
+    deserializerWith({
+        writer: lioncoreWriterFor(lionWebVersion),
+        languages: [lionWebVersion.lioncoreFacade.language, ...(dependentLanguages ?? [])],
+        problemReporter: problemReporter ?? consoleProblemReporter
+    })(
+        serializationChunk,
+        [lionWebVersion.builtinsFacade.language, ...(dependentLanguages ?? [])].flatMap(nodesExtractorUsing(lioncoreReaderFor(lionWebVersion))),
+    )
+        .filter((rootNode) => rootNode instanceof Language)
+        .map((language) => (language as Language).dependingOn(...(dependentLanguages ?? [])))
 
 
 /**
@@ -13,31 +46,27 @@ import { Language } from "./types.js"
  * as an instance of the LionCore metametamodel, using {@link _M3Concept these type definitions}.
  */
 export const deserializeLanguages = (serializationChunk: LionWebJsonChunk, ...dependentLanguages: Language[]): Language[] =>
-    deserializeLanguagesWithReporter(serializationChunk, consoleProblemReporter, ...dependentLanguages)
+    deserializeLanguagesFrom({ serializationChunk, dependentLanguages })
+
 
 /**
  * Deserializes languages that have been serialized into the LionWeb serialization JSON format
  * as an instance of the LionCore metametamodel, using {@link _M3Concept these type definitions}.
  * This function takes a {@link ProblemReporter} to be able to see what problems occurred.
+ *
+ * @deprecated Use {@link deserializeLanguagesFrom} instead.
  */
 export const deserializeLanguagesWithReporter = (
     serializationChunk: LionWebJsonChunk,
     problemReporter: ProblemReporter,
     ...dependentLanguages: Language[]
 ): Language[] =>
-    deserializerWith({
-        writer: lioncoreWriter,
-        languages: [lioncore, ...dependentLanguages],
-        problemReporter: problemReporter
-    })(
-        serializationChunk,
-        [lioncoreBuiltins, ...dependentLanguages].flatMap(nodesExtractorUsing(lioncoreReader)),
-    )
-        .filter((rootNode) => rootNode instanceof Language)
-        .map((language) => (language as Language).dependingOn(...dependentLanguages))
+    deserializeLanguagesFrom({ serializationChunk, problemReporter, dependentLanguages })
 
 /**
  * Legacy alias for {@link deserializeLanguagesWithReporter}, kept for backward compatibility, and to be deprecated and removed later.
+ *
+ * @deprecated Use {@link deserializeLanguagesFrom} instead.
  */
 export const deserializeLanguagesWithHandler = deserializeLanguagesWithReporter