@maka/maka-cli 5.1.40 → 5.1.42

package/bundle/typescript/src/generators/package.js

@@ -1,5 +1,6 @@
 import path from 'path';
 import { Generator } from '../generator.js';
+import { ApiEngines } from '../tools/fsi/fsi.interfaces.js';
 import { camelCase, kebabCase, pascalCase } from "change-case";
 Generator.create({
     name: 'package',
@@ -7,7 +8,10 @@ Generator.create({
     usage: 'maka {generate, g}:{package, p} [path/]<name>',
     mustBeInMakaProject: true,
     shortDesc: 'Scaffolding for a Meteor Package.\nhttps://docs.meteor.com/api/packagejs.html',
-    validOpts: ['dir'],
+    validOpts: [{
+            name: 'dir',
+            description: 'Custom directory path for package'
+        }],
     examples: [
         'maka g:package todos:package'
     ]
@@ -29,7 +33,8 @@ Generator.create({
         camelCaseName: camelCase(opts.resourceName),
         fileName: file,
         client: config.engines.client,
-        graphql: config.engines.graphql,
+        clientGraphql: config.engines.graphql, // Client-side GraphQL (Apollo Client)
+        apiGraphql: (config.engines.apis || []).includes(ApiEngines.GRAPHQL) || config.engines.api === ApiEngines.GRAPHQL, // Server-side GraphQL API
         ssr: config.engines.ssr,
         isComponent: opts.hasOwnProperty('component'),
         isLayout: opts.hasOwnProperty('layout'),

package/bundle/typescript/src/generators/package.js.map

@@ -1 +1 @@
-{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/generators/package.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/generators/package.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/generators/page.js

@@ -2,6 +2,7 @@ import path from 'path';
 import { Generator } from '../generator.js';
 import { Log } from '../tools/log/log.class.js';
 import { UsageError } from '../error.js';
+import { ApiEngines } from '../tools/fsi/fsi.interfaces.js';
 import { camelCase, kebabCase, pascalCase } from "change-case";
 const aliases = ['p'];
 Generator.create({
@@ -12,10 +13,12 @@ Generator.create({
     mustBeInMakaProject: true,
     validOpts: [{
             name: 'private',
-            boolFlag: true
+            boolFlag: true,
+            description: 'Generate as a private/protected route'
         },
         {
             name: 'url',
+            description: 'Custom URL path for the page route'
         }],
     examples: [
         'maka g:page todos/todos-item'
@@ -62,7 +65,8 @@ Generator.create({
         className: pascalCase(name),
         camelCaseName: camelCase(name),
         fileName: kebabCase(name),
-        graphql: config.engines.graphql,
+        clientGraphql: config.engines.graphql, // Client-side GraphQL (Apollo Client)
+        apiGraphql: (config.engines.apis || []).includes(ApiEngines.GRAPHQL) || config.engines.api === ApiEngines.GRAPHQL, // Server-side GraphQL API
         features: config.features,
         client: config.engines.client,
         api: config.engines.api,

package/bundle/typescript/src/generators/page.js.map

@@ -1 +1 @@
-{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/generators/page.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/generators/page.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/generators/publish.js

@@ -6,7 +6,11 @@ Generator.create({
     aliases: ['p'],
     usage: 'maka {generate, g}:{publish, p} <name>',
     shortDesc: 'Scaffolding for a publish function.\nhttps://docs.meteor.com/api/pubsub.html',
-    validOpts: ['force'],
+    validOpts: [{
+            name: 'force',
+            boolFlag: true,
+            description: 'Overwrite existing files'
+        }],
     requiredOpts: ['globalPublish'],
     mustBeInMakaProject: true,
     examples: [

package/bundle/typescript/src/generators/publish.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../src/generators/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAUhD,SAAS,CAAC,MAAM,CAAC;IACf,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,CAAC,GAAG,CAAC;IACd,KAAK,EAAE,wCAAwC;IAC/C,SAAS,EAAE,8EAA8E;IACzF,SAAS,EAAE,CAAC,OAAO,CAAC;IACpB,YAAY,EAAE,CAAC,eAAe,CAAC;IAC/B,mBAAmB,EAAE,IAAI;IACzB,QAAQ,EAAE;QACR,sBAAsB;KACvB;CACF,EAAE,KAAK,WAAW,IAAc,EAAE,IAAkB;IACnD,IAAI,CAAC;QACH,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QACzC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC;QACxC,MAAM,WAAW,GAAG,sCAAsC,CAAC;QAE3D,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEtD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,WAAW,CAAC;YAC7C,SAAS,EAAE;gBACT,WAAW;gBACX,IAAI,CAAC,GAAG;gBACR,EAAE;gBACF,gBAAgB;aACjB;SACF,CAAC,CAAC;QAEH,0CAA0C;QAC1C,IAAI,YAAY,GAAG,IAAI,CAAC;QACxB,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;YACvC,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;QAED,MAAM,OAAO,GAAG;YACd,IAAI,EAAE,IAAI,CAAC,YAAY;YACvB,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC;YACzC,QAAQ,EAAE,IAAI;YACd,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;QAEF,MAAM,QAAQ,CAAC,QAAQ,CAAC;YACtB,OAAO,EAAE,oBAAoB;YAC7B,QAAQ,EAAE,GAAG,iBAAiB,IAAI,YAAY,EAAE;YAChD,OAAO;YACP,MAAM,EAAE,aAAa;YACrB,KAAK,EAAE,WAAW;SACnB,CAAC,CAAC;QAEH,2CAA2C;QAC3C,8DAA8D;QAC9D,wFAAwF;QACxF,MAAM;QACN,6CAA6C;QAC7C,gDAAgD;QAChD,aAAa;QACb,WAAW;QACX,MAAM;QACN,EAAE;QACF,qCAAqC;QACrC,wBAAwB;QACxB,4BAA4B;QAC5B,MAAM;QAEN,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC;YACpC,SAAS,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;SACrG,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACnD,MAAM,QAAQ,CAAC,iBAAiB,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,yBAAyB,OAAO,GAAG,gBAAgB,IAAI;SACjE,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}
+{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../src/generators/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAUhD,SAAS,CAAC,MAAM,CAAC;IACf,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,CAAC,GAAG,CAAC;IACd,KAAK,EAAE,wCAAwC;IAC/C,SAAS,EAAE,8EAA8E;IACzF,SAAS,EAAE,CAAC;YACV,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,0BAA0B;SACxC,CAAC;IACF,YAAY,EAAE,CAAC,eAAe,CAAC;IAC/B,mBAAmB,EAAE,IAAI;IACzB,QAAQ,EAAE;QACR,sBAAsB;KACvB;CACF,EAAE,KAAK,WAAW,IAAc,EAAE,IAAkB;IACnD,IAAI,CAAC;QACH,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QACzC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC;QACxC,MAAM,WAAW,GAAG,sCAAsC,CAAC;QAE3D,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEtD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,WAAW,CAAC;YAC7C,SAAS,EAAE;gBACT,WAAW;gBACX,IAAI,CAAC,GAAG;gBACR,EAAE;gBACF,gBAAgB;aACjB;SACF,CAAC,CAAC;QAEH,0CAA0C;QAC1C,IAAI,YAAY,GAAG,IAAI,CAAC;QACxB,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;YACvC,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;QAED,MAAM,OAAO,GAAG;YACd,IAAI,EAAE,IAAI,CAAC,YAAY;YACvB,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC;YACzC,QAAQ,EAAE,IAAI;YACd,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;QAEF,MAAM,QAAQ,CAAC,QAAQ,CAAC;YACtB,OAAO,EAAE,oBAAoB;YAC7B,QAAQ,EAAE,GAAG,iBAAiB,IAAI,YAAY,EAAE;YAChD,OAAO;YACP,MAAM,EAAE,aAAa;YACrB,KAAK,EAAE,WAAW;SACnB,CAAC,CAAC;QAEH,2CAA2C;QAC3C,8DAA8D;QAC9D,wFAAwF;QACxF,MAAM;QACN,6CAA6C;QAC7C,gDAAgD;QAChD,aAAa;QACb,WAAW;QACX,MAAM;QACN,EAAE;QACF,qCAAqC;QACrC,wBAAwB;QACxB,4BAA4B;QAC5B,MAAM;QAEN,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC;YACpC,SAAS,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;SACrG,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACnD,MAAM,QAAQ,CAAC,iBAAiB,CAAC;YAC/B,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,yBAAyB,OAAO,GAAG,gBAAgB,IAAI;SACjE,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}

package/bundle/typescript/src/generators/route.js

@@ -10,10 +10,12 @@ Generator.create({
     aliases,
     validOpts: [{
             name: 'private',
-            boolFlag: true
+            boolFlag: true,
+            description: 'Generate as a private/protected route'
         },
         {
-            name: 'route'
+            name: 'route',
+            description: 'Custom route path'
         }],
     usage: 'maka {generate, g}:{route, r}',
     shortDesc: 'Scaffolding for a Route.',

package/bundle/typescript/src/generators/route.js.map

@@ -1 +1 @@
-{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../src/generators/route.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EACL,UAAU,EACX,MAAM,aAAa,CAAC;AAYrB,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;AACtB,SAAS,CAAC,MAAM,CAAC;IACf,IAAI,EAAE,OAAO;IACb,mBAAmB,EAAE,IAAI;IACzB,OAAO;IACP,SAAS,EAAE,CAAC;YACV,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,IAAI;SACf;QACC;YACE,IAAI,EAAE,OAAO;SACd,CAAC;IACJ,KAAK,EAAE,+BAA+B;IACtC,SAAS,EAAE,0BAA0B;IACrC,QAAQ,EAAE,EACT;CAEF,EAAE,KAAK,WAAW,IAAc,EAAE,IAAgB;IACjD,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;IAC9C,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAE5C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC;QAExC,0EAA0E;QAC1E,IAAI,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAE9C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,GAAG,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAClD,MAAM,IAAI,UAAU,EAAE,CAAC;QACzB,CAAC;QAED,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAExB,uCAAuC;QACvC,8DAA8D;QAC9D,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAExG,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,KAAK,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,OAAO,GAAG,KAAK,GAAG,CAAA,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC3F,CAAC;QAED,wBAAwB;QACxB,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAEpC,MAAM,SAAS,GAAG,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3C,MAAM,OAAO,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC1E,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,SAAS,EAAE,CAAC,CAAC;QAEnG,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,QAAQ,CAAC,cAAc,CAAC;gBAC5B,QAAQ,EAAE,YAAY;gBACtB,OAAO,EAAE,gBAAgB,KAAK,yBAAyB,IAAI,SAAS;gBACpE,KAAK,EAAE,CAAC,oCAAoC,CAAC;gBAC7C,GAAG,EAAE,CAAC,UAAU,CAAC;aAClB,CAAC,CAAC;QAEL,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,CAAC,cAAc,CAAC;gBAC5B,QAAQ,EAAE,YAAY;gBACtB,OAAO,EAAE,gBAAgB,KAAK,yBAAyB,IAAI,SAAS;gBACpE,KAAK,EAAE,CAAC,cAAc,CAAC;gBACvB,GAAG,EAAE,CAAC,iBAAiB,CAAC;aACzB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}
+{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../src/generators/route.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/templates/meteor/template/template-tests.js.jsx

@@ -4,7 +4,7 @@ import React from 'react';
 import { render, unmountComponentAtNode } from "react-dom";
 import { act } from "react-dom/test-utils";
 
-if (Meteor.isClient) {<% if(graphql === 'apollo' && !isStore) { %>
+if (Meteor.isClient) {<% if(clientGraphql === 'apollo' && !isStore) { %>
   import { MockedProvider } from '@apollo/react-testing';
   import gql from 'graphql-tag';
   const mocks = [
@@ -41,7 +41,7 @@ if (Meteor.isClient) {<% if(graphql === 'apollo' && !isStore) { %>
   describe('<<%= className %>/>', function() {
 
    it('did render', () => {
-     act(() => {<% if(graphql === 'apollo' && !isStore) { %>
+     act(() => {<% if(clientGraphql === 'apollo' && !isStore) { %>
        render(
           <MockedProvider mocks={mocks} addTypename={false}>
            <<%= className %>/>

package/bundle/typescript/src/templates/meteor/template/template-tests.js.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 import { render, unmountComponentAtNode } from "react-dom";
 import { act } from "react-dom/test-utils";
 
-if (Meteor.isClient) {<% if(graphql === 'apollo' && !isStore) { %>
+if (Meteor.isClient) {<% if(clientGraphql === 'apollo' && !isStore) { %>
   import { MockedProvider } from '@apollo/react-testing';
   import gql from 'graphql-tag';
   const mocks = [
@@ -41,7 +41,7 @@ if (Meteor.isClient) {<% if(graphql === 'apollo' && !isStore) { %>
   describe('<<%= className %>/>', function() {
 
    it('did render', () => {
-     act(() => {<% if(graphql === 'apollo' && !isStore) { %>
+     act(() => {<% if(clientGraphql === 'apollo' && !isStore) { %>
        render(
           <MockedProvider mocks={mocks} addTypename={false}>
            <<%= className %>/>

package/bundle/typescript/src/templates/meteor/template/template.js.jsx

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';<% if ( isStore ) { %>
 import { Store } from 'reflux'; <% } else { %>
 import { Component } from 'reflux';<% } %><% } %>
 // https://github.com/meteor/react-packages/tree/master/packages/react-meteor-data#withtrackerreactivefn-higher-order-component
-import { withTracker } from 'meteor/react-meteor-data';<% if(graphql === 'apollo') { %>
+import { withTracker } from 'meteor/react-meteor-data';<% if(clientGraphql === 'apollo') { %>
 import { gql } from '@apollo/client';
 // https://www.apollographql.com/docs/react/api/react/hoc/#graphqlquery-configcomponent
 import { graphql } from '@apollo/client/react/hoc';<% } %><% if (theme === 'material' ) { %>
@@ -69,7 +69,7 @@ class <%= className %>Component extends Store { <% } %><% if (client === 'reflux
 }
 
 const <%= className %> = compose(
-  withTracker(() => {}),<% if(graphql === 'apollo') { %>
+  withTracker(() => {}),<% if(clientGraphql === 'apollo') { %>
   //graphql(gql`query Todos { todos }`, { variables: {/* input */} }),<% } %><% if(theme === 'material') { %>
   withStyles(styles),<% } %>
 )(<%= className %>Component);

package/bundle/typescript/src/templates/meteor/template/template.js.tsx

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';<% if ( isStore ) { %>
 import Store from 'reflux'; <% } else { %>
 import Component from 'reflux';<% } %><% } %>
 // https://github.com/meteor/react-packages/tree/master/packages/react-meteor-data#withtrackerreactivefn-higher-order-component
-import { withTracker } from 'meteor/react-meteor-data';<% if(graphql === 'apollo') { %>
+import { withTracker } from 'meteor/react-meteor-data';<% if(clientGraphql === 'apollo') { %>
 import { gql } from '@apollo/client';
 // https://www.apollographql.com/docs/react/api/react/hoc/#graphqlquery-configcomponent
 import { graphql } from '@apollo/client/react/hoc';<% } %><% if (theme === 'material' ) { %>
@@ -81,7 +81,7 @@ class <%= className %>Component extends Reflux.Store<<%= className %>Component>
 }
 
 const <%= className %> = compose(
-  withTracker(() => {}),<% if(graphql === 'apollo') { %>
+  withTracker(() => {}),<% if(clientGraphql === 'apollo') { %>
   //graphql(gql`query Todos { todos }`, { variables: {/* input */} }),<% } %><% if(theme === 'material') { %>
   withStyles(styles),<% } %>
 )(<%= className %>Component);

package/bundle/typescript/src/templates/react/hook/hook.js.jsx

@@ -5,7 +5,7 @@ import { Outlet } from 'react-router-dom';
 <% }%>
 
 function <%= className %>(props) {
-  <% if(graphql === 'apollo') { %>
+  <% if(clientGraphql === 'apollo') { %>
   //const { loading, error, data } = useQuery(gql`query Todos { todos }`, { variables: {/* input */} }); <% } %><% if (withTranslations) { %>
   const { t } = useTranslation();<% } %>
 

package/bundle/typescript/src/templates/react/kit/auth/service/meteor-auth-service.js.jsx

@@ -41,11 +41,13 @@ class AuthService {
           Meteor.loginWithToken(token, (error) => {
             if (error) {
               reject(error);
+            } else {
+              resolve(Meteor.user());
             }
-            resolve(Meteor.user());
           })
+        } else {
+          resolve(null);
         }
-        resolve(null);
       });
     } catch (error) {
       console.error('Token validation failed:', error);

package/bundle/typescript/src/templates/react/kit/frames/frames-demo.css

@@ -0,0 +1,63 @@
+#<%= fileName %> {
+  width: 100%;
+  min-height: 100vh;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+.<%= fileName %>-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: rgba(255, 255, 255, 0.95);
+  padding: 15px 25px;
+  border-radius: 8px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.<%= fileName %>-header h1 {
+  margin: 0;
+  font-size: 24px;
+  color: #333;
+  font-weight: 600;
+}
+
+.frames-container {
+  position: relative;
+  width: 100%;
+  min-height: calc(100vh - 120px);
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 8px;
+  overflow: hidden;
+}
+
+.frame-content {
+  padding: 20px;
+  height: 100%;
+  overflow: auto;
+}
+
+.frame-content h3 {
+  margin-top: 0;
+  color: #333;
+  font-size: 18px;
+}
+
+.frame-content p {
+  margin: 10px 0;
+  color: #666;
+  line-height: 1.6;
+}
+
+.frame-content code {
+  background: #f4f4f4;
+  padding: 2px 6px;
+  border-radius: 3px;
+  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+  font-size: 13px;
+  color: #e83e8c;
+}

package/bundle/typescript/src/templates/react/kit/frames/frames-demo.jsx

@@ -0,0 +1,153 @@
+import './<%= fileName %>.css';
+import React, { Component } from 'react';
+import { withTracker } from 'meteor/maka:react-tracker';
+import { Frame, FramesContainer, Workspace, FrameManagerBar } from 'meteor/maka:maka-frames';
+import { WorkspaceManagerComponent } from '../../components/workspace-manager/workspace-manager';
+import PropTypes from 'prop-types';
+
+class <%= className %> extends Component {
+  static propTypes = {};
+
+  static defaultProps = {};
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      currentWorkspaceId: 'demo-workspace',
+      showFrameManager: true
+    };
+  }
+
+  toggleFrameManager = () => {
+    this.setState({ showFrameManager: !this.state.showFrameManager });
+  }
+
+  handleWorkspaceSwitch = (workspaceId) => {
+    this.setState({ currentWorkspaceId: workspaceId });
+  }
+
+  // Custom frame menu items
+  getFrameMenuItems = () => {
+    return [];
+  }
+
+  // Workspace context menu items
+  getWorkspaceMenuItems = (toggleFrame, resetWorkspace) => {
+    return [
+      {
+        label: 'New Frame',
+        icon: '➕',
+        action: () => {
+          const newId = `demo-frame-${Date.now()}`;
+          toggleFrame(newId, {
+            title: 'New Frame',
+            x: Math.random() * 300 + 100,
+            y: Math.random() * 300 + 100,
+            width: 400,
+            height: 300
+          });
+        }
+      },
+      { divider: true },
+      {
+        label: 'Reset Workspace',
+        icon: '🔄',
+        action: () => {
+          resetWorkspace();
+        }
+      }
+    ];
+  }
+
+  render() {
+    const { currentWorkspaceId } = this.state;
+
+    return (
+      <Workspace
+        workspaceId={currentWorkspaceId}
+        workspaceName={currentWorkspaceId === 'demo-workspace' ? 'Demo Workspace' : `Workspace ${currentWorkspaceId.split('-')[1]}`}
+        contextMenuItems={this.getFrameMenuItems()}
+        enableContextMenu={true}
+        workspaceContextMenuItems={({ toggleFrame, resetWorkspace }) => this.getWorkspaceMenuItems(toggleFrame, resetWorkspace)}
+        enableWorkspaceContextMenu={true}
+      >
+        {({ workspace, allWorkspaces, updateFrame, handleFrameMenu, handleWorkspaceContextMenu, minimizeFrame, onFrameManagerClick, onFrameManagerClose }) => {
+          return (
+            <div id="<%= fileName %>">
+              <div className="<%= fileName %>-header">
+                <h1>Maka Frames Demo</h1>
+
+                <WorkspaceManagerComponent
+                  currentWorkspaceId={this.state.currentWorkspaceId}
+                  allWorkspaces={allWorkspaces}
+                  user={this.props.user}
+                  onWorkspaceSwitch={this.handleWorkspaceSwitch}
+                />
+
+                <button onClick={this.toggleFrameManager} style={{ padding: '8px 16px', cursor: 'pointer', borderRadius: '4px', border: 'none', background: '#fff', fontWeight: 'bold' }}>
+                  {this.state.showFrameManager ? 'Hide' : 'Show'} Toolbar
+                </button>
+              </div>
+
+              <FramesContainer
+                className="frames-container"
+                onContextMenu={handleWorkspaceContextMenu}
+              >
+                {/* Render all frames dynamically */}
+                {workspace.frames.map(frame => (
+                  frame.display && (
+                    <Frame
+                      key={frame.id}
+                      id={frame.id}
+                      title={frame.title}
+                      x={frame.x}
+                      y={frame.y}
+                      width={frame.width}
+                      height={frame.height}
+                      display={frame.display}
+                      zIndex={frame.zIndex}
+                      onMenuClick={handleFrameMenu}
+                      onFrameUpdate={updateFrame}
+                      onMinimize={minimizeFrame}
+                    >
+                      <div className="frame-content">
+                        <h3>{frame.title}</h3>
+                        <p>Frame content goes here.</p>
+                        <p>ID: <code>{frame.id}</code></p>
+                        <p>Position: ({frame.x}, {frame.y})</p>
+                        <p>Size: {frame.width} × {frame.height}</p>
+                      </div>
+                    </Frame>
+                  )
+                ))
+                }
+              </FramesContainer>
+              {this.state.showFrameManager && (
+                <FrameManagerBar
+                  workspace={workspace}
+                  allWorkspaces={allWorkspaces}
+                  onFrameClick={onFrameManagerClick}
+                  onFrameClose={onFrameManagerClose}
+                  onWorkspaceClick={this.handleWorkspaceSwitch}
+                  position="bottom"
+                  showClosed={true}
+                  maxItems={20}
+                />
+              )}
+            </div>
+          );
+        }}
+      </Workspace>
+    );
+  }
+}
+
+const <%= className %>WithData = withTracker(() => {
+  const user = Meteor.user();
+
+  return {
+    user
+  };
+})(<%= className %>);
+
+export { <%= className %>WithData as <%= className %> };

package/bundle/typescript/src/templates/react/kit/frames/frames-demo.tsx

@@ -0,0 +1,164 @@
+import './<%= fileName %>.css';
+import * as React from 'react';
+import { Component } from 'react';
+import { withTracker } from 'meteor/maka:react-tracker';
+import { Frame, FramesContainer, Workspace, FrameManagerBar } from 'meteor/maka:maka-frames';
+import { WorkspaceManagerComponent } from '../../components/workspace-manager/workspace-manager';
+import PropTypes from 'prop-types';
+
+interface <%= className %>Props {
+  user?: any;
+  allWorkspaces: any[];
+}
+
+interface <%= className %>State {
+  currentWorkspaceId: string;
+  showFrameManager: boolean;
+}
+
+class <%= className %> extends Component<<%= className %>Props, <%= className %>State> {
+  static propTypes = {};
+
+  static defaultProps = {};
+
+  constructor(props: <%= className %>Props) {
+    super(props);
+    this.state = {
+      currentWorkspaceId: 'demo-workspace',
+      showFrameManager: true
+    };
+  }
+
+  toggleFrameManager = () => {
+    this.setState({ showFrameManager: !this.state.showFrameManager });
+  }
+
+  handleWorkspaceSwitch = (workspaceId: string) => {
+    this.setState({ currentWorkspaceId: workspaceId });
+  }
+
+  // Custom frame menu items
+  getFrameMenuItems = () => {
+    return [];
+  }
+
+  // Workspace context menu items
+  getWorkspaceMenuItems = (toggleFrame: any, resetWorkspace: any) => {
+    return [
+      {
+        label: 'New Frame',
+        icon: '➕',
+        action: () => {
+          const newId = `demo-frame-${Date.now()}`;
+          toggleFrame(newId, {
+            title: 'New Frame',
+            x: Math.random() * 300 + 100,
+            y: Math.random() * 300 + 100,
+            width: 400,
+            height: 300
+          });
+        }
+      },
+      { divider: true },
+      {
+        label: 'Reset Workspace',
+        icon: '🔄',
+        action: () => {
+          resetWorkspace();
+        }
+      }
+    ];
+  }
+
+  render() {
+    const { currentWorkspaceId } = this.state;
+
+    return (
+      <Workspace
+        workspaceId={currentWorkspaceId}
+        workspaceName={currentWorkspaceId === 'demo-workspace' ? 'Demo Workspace' : `Workspace ${currentWorkspaceId.split('-')[1]}`}
+        contextMenuItems={this.getFrameMenuItems()}
+        enableContextMenu={true}
+        workspaceContextMenuItems={({ toggleFrame, resetWorkspace }) => this.getWorkspaceMenuItems(toggleFrame, resetWorkspace)}
+        enableWorkspaceContextMenu={true}
+      >
+        {({ workspace, allWorkspaces, updateFrame, handleFrameMenu, handleWorkspaceContextMenu, minimizeFrame, onFrameManagerClick, onFrameManagerClose }) => {
+          return (
+            <div id="<%= fileName %>">
+              <div className="<%= fileName %>-header">
+                <h1>Maka Frames Demo</h1>
+
+                <WorkspaceManagerComponent
+                  currentWorkspaceId={this.state.currentWorkspaceId}
+                  allWorkspaces={allWorkspaces}
+                  user={this.props.user}
+                  onWorkspaceSwitch={this.handleWorkspaceSwitch}
+                />
+
+                <button onClick={this.toggleFrameManager} style={{ padding: '8px 16px', cursor: 'pointer', borderRadius: '4px', border: 'none', background: '#fff', fontWeight: 'bold' }}>
+                  {this.state.showFrameManager ? 'Hide' : 'Show'} Toolbar
+                </button>
+              </div>
+
+              <FramesContainer
+                className="frames-container"
+                onContextMenu={handleWorkspaceContextMenu}
+              >
+                {/* Render all frames dynamically */}
+                {workspace.frames.map((frame: any) => (
+                  frame.display && (
+                    <Frame
+                      key={frame.id}
+                      id={frame.id}
+                      title={frame.title}
+                      x={frame.x}
+                      y={frame.y}
+                      width={frame.width}
+                      height={frame.height}
+                      display={frame.display}
+                      zIndex={frame.zIndex}
+                      onMenuClick={handleFrameMenu}
+                      onFrameUpdate={updateFrame}
+                      onMinimize={minimizeFrame}
+                    >
+                      <div className="frame-content">
+                        <h3>{frame.title}</h3>
+                        <p>Frame content goes here.</p>
+                        <p>ID: <code>{frame.id}</code></p>
+                        <p>Position: ({frame.x}, {frame.y})</p>
+                        <p>Size: {frame.width} × {frame.height}</p>
+                      </div>
+                    </Frame>
+                  )
+                ))
+                }
+              </FramesContainer>
+              {this.state.showFrameManager && (
+                <FrameManagerBar
+                  workspace={workspace}
+                  allWorkspaces={allWorkspaces}
+                  onFrameClick={onFrameManagerClick}
+                  onFrameClose={onFrameManagerClose}
+                  onWorkspaceClick={this.handleWorkspaceSwitch}
+                  position="bottom"
+                  showClosed={true}
+                  maxItems={20}
+                />
+              )}
+            </div>
+          );
+        }}
+      </Workspace>
+    );
+  }
+}
+
+const <%= className %>WithData = withTracker(() => {
+  const user = Meteor.user();
+
+  return {
+    user
+  };
+})(<%= className %>);
+
+export { <%= className %>WithData as <%= className %> };