@cmpose/core 0.3.0 → 0.5.0

package/src/game/validate.js

@@ -2,6 +2,7 @@
 const PV = require('../ProjectValidator');
 const limits = require('../limits');
 const { GAME_SCHEMA: S } = require('./contract');
+const { checkThemeShape } = require('./themes');
 
 const CSHARP_KEYWORDS = ('abstract as base bool break byte case catch char checked class const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long namespace new null object operator out override params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unchecked unsafe ushort using virtual void volatile while').split(' ');
 const KOTLIN_KEYWORDS = PV.KOTLIN_HARD_KEYWORDS;
@@ -179,9 +180,17 @@ function validateGame(input) {
         ids = r.value;
     }
 
+    // The family and font pair are checked against the template's themes.json later (validateTheme)
+    let theme = null;
+    if (input.theme !== undefined) {
+        const r = checkThemeShape(input.theme);
+        if (r.error) return fail(r.error);
+        theme = r.value;
+    }
+
     return {
         ok: true,
-        value: { projectName, appName, packageName, companyName, templateType, render, flags, features, minSdk, iosVersion, ids }
+        value: { projectName, appName, packageName, companyName, templateType, render, flags, features, minSdk, iosVersion, ids, theme }
     };
 }
 

package/src/index.js

@@ -27,6 +27,7 @@ module.exports = {
     fileService: require('./fileService'),
     featureModules: require('./featureModules'),
     backendOption: require('./backendOption'),
+    markerBlocks: require('./markerBlocks'),
     TemplateCapabilityError: require('./featureModules').TemplateCapabilityError,
     verifyGeneratedProject: require('./generationVerifier').verifyGeneratedProject,
     validate: require('./validate').validate,
@@ -35,5 +36,6 @@ module.exports = {
     generateCmpProject: require('./generate').generateCmpProject,
     templateCache: require('./templateCache'),
     game: require('./game'),
+    backend: require('./backend'),
     TemplateFetchError: require('./templateCache').TemplateFetchError
 };

package/src/markerBlocks.js

@@ -0,0 +1,93 @@
+'use strict';
+const path = require('path');
+
+// The cmpose:<tag> marker blocks a template wraps around an optional part (the CMP template's backend, the backend
+// template's sharing). Off drops each block, on drops only the marker lines.
+
+const COMMENTS = { slash: '//', dash: '--', hash: '#' };
+// html: the CMP template's name for the xml form
+const XML_KINDS = new Set(['xml', 'html']);
+
+// The backend template's marker form by file name (the CMP backend option keeps its own table)
+const KIND_BY_EXTENSION = {
+    '.kt': 'slash', '.kts': 'slash',
+    '.sql': 'dash',
+    '.yml': 'hash', '.yaml': 'hash', '.toml': 'hash', '.properties': 'hash',
+    '.md': 'xml'
+};
+const KIND_BY_NAME = { '.gitignore': 'hash', '.env.example': 'hash', '.dockerignore': 'hash' };
+
+function markersOf(kind, tag) {
+    if (XML_KINDS.has(kind)) return { open: `<!-- cmpose:${tag} -->`, close: `<!-- /cmpose:${tag} -->` };
+    const comment = COMMENTS[kind];
+    if (!comment) throw new Error(`unknown marker kind: ${kind}`);
+    return { open: `${comment} cmpose:${tag}`, close: `${comment} /cmpose:${tag}` };
+}
+
+// Off: drops each marked block with its marker lines; on: drops only the marker lines. Either way a blank
+// line on both sides of a dropped run becomes one (blank runs elsewhere stay).
+function removeMarkedBlocks(content, kind, keep, tag = 'backend') {
+    const { open, close } = markersOf(kind, tag);
+    const out = [];
+    const joins = [];
+    let inside = false;
+    let dropped = false;
+    for (const line of content.split('\n')) {
+        const t = line.trim();
+        if (t === open) {
+            if (inside) throw new Error(`nested ${open}`);
+            inside = true;
+            dropped = true;
+            continue;
+        }
+        if (t === close) {
+            if (!inside) throw new Error(`stray ${close}`);
+            inside = false;
+            dropped = true;
+            continue;
+        }
+        if (inside && !keep) continue;
+        if (dropped) joins.push(out.length);
+        dropped = false;
+        out.push(line);
+    }
+    if (inside) throw new Error(`unclosed cmpose:${tag} block`);
+    if (dropped) joins.push(out.length);
+    return collapseBlankRuns(out, joins).join('\n');
+}
+
+// At each join (the index of the first line after a dropped run), blank lines that follow a blank line go
+function collapseBlankRuns(lines, joins) {
+    const drop = new Set();
+    for (const join of joins) {
+        if (join === 0 || lines[join - 1] !== '') continue;
+        for (let i = join; i < lines.length && lines[i] === ''; i++) drop.add(i);
+    }
+    return lines.filter((_, i) => !drop.has(i));
+}
+
+// Off: the line after a swap marker becomes the marker's text at that line's indentation; on: the marker goes
+function applySwapMarkers(content, keep, tag = 'backend', kind = 'slash') {
+    const comment = COMMENTS[kind];
+    if (!comment) throw new Error(`no swap marker for kind: ${kind}`);
+    const swap = `${comment} cmpose:${tag}-off: `;
+    const lines = content.split('\n');
+    const out = [];
+    for (let i = 0; i < lines.length; i++) {
+        const t = lines[i].trim();
+        if (!t.startsWith(swap)) { out.push(lines[i]); continue; }
+        const next = lines[i + 1];
+        if (next === undefined) throw new Error(`cmpose:${tag}-off marker on the last line`);
+        if (keep) { out.push(next); } else { out.push(next.match(/^\s*/)[0] + t.slice(swap.length)); }
+        i++;
+    }
+    return out.join('\n');
+}
+
+// The marker kind of a backend template file; undefined when it takes no markers
+function kindOf(file) {
+    const name = path.basename(file);
+    return Object.hasOwn(KIND_BY_NAME, name) ? KIND_BY_NAME[name] : KIND_BY_EXTENSION[path.extname(name)];
+}
+
+module.exports = { removeMarkedBlocks, applySwapMarkers, kindOf };

package/src/pins.js

@@ -3,5 +3,7 @@
 module.exports = Object.freeze({
     cmp: Object.freeze({ repo: 'whinstudio/cmpose-template', ref: 'template-2026.10.17' }),
     // The release step replaces the placeholder with the game template's tag
-    game: Object.freeze({ repo: 'whinstudio/cmpose-game-template', ref: 'game-template-2026.10.15.2' })
+    game: Object.freeze({ repo: 'whinstudio/cmpose-game-template', ref: 'game-template-2026.10.17' }),
+    // The release step replaces the placeholder with the backend template's tag
+    backend: Object.freeze({ repo: 'whinstudio/cmpose-backend-template', ref: 'backend-template-2026.10.17' })
 });