@maka/maka-cli 5.123.0 → 5.123.1

package/bundle/typescript/src/templates/meteor/api/apollo-gateway.js.ts

@@ -1,55 +1,55 @@
-import { ApolloServer } from '@apollo/server';
-import { ApolloGateway, IntrospectAndCompose } from '@apollo/gateway';
-import { WebApp } from 'meteor/webapp';
-import express, { Request, Response } from 'express';
-import { expressMiddleware } from '@as-integrations/express5';
-import { ApolloServerPluginUsageReportingDisabled } from '@apollo/server/plugin/disabled';
-import { Meteor } from 'meteor/meteor';
-
-// Define the context interface
-interface Context {
-  token?: string;
-}
-
-// Use `IntrospectAndCompose` to introspect the subgraphs (empty for now, add subgraphs as needed)
-const gateway = new ApolloGateway({
-  supergraphSdl: new IntrospectAndCompose({
-    subgraphs: [
-    ],
-  }),
-});
-
-const server = new ApolloServer<Context>({
-  gateway, // Attach the Apollo Gateway
-  cacheControl: {
-    defaultMaxAge: 5, // Cache control settings
-  },
-  cache: 'bounded',
-  formatError: (err) => {
-    if (Meteor.isProduction) {
-      return { message: err.extensions?.code || 'Internal Server Error' };
-    }
-    console.error(err);
-    return err;
-  },
-  plugins: [ApolloServerPluginUsageReportingDisabled()]
-});
-
-const startApolloGateway = async (server: ApolloServer<Context>) => {
-  await server.start();
-
-  // Use Meteor's WebApp to handle the Apollo middleware
-  WebApp.connectHandlers.use(
-    '/graphql', // The endpoint for the federated GraphQL API
-    express.json({ limit: '5mb' }), // Handle JSON requests
-    expressMiddleware(server, {
-      context: async ({ req }: { req: Request }): Promise<Context> => {
-        const token = req.headers.authorization || null;
-        return { token }; // Pass token for authentication
-      },
-    }),
-  );
-};
-
-// Start the Apollo Gateway server
-startApolloGateway(server);
+import { ApolloServer } from '@apollo/server';
+import { ApolloGateway, IntrospectAndCompose } from '@apollo/gateway';
+import { WebApp } from 'meteor/webapp';
+import express, { Request, Response } from 'express';
+import { expressMiddleware } from '@as-integrations/express5';
+import { ApolloServerPluginUsageReportingDisabled } from '@apollo/server/plugin/disabled';
+import { Meteor } from 'meteor/meteor';
+
+// Define the context interface
+interface Context {
+  token?: string;
+}
+
+// Use `IntrospectAndCompose` to introspect the subgraphs (empty for now, add subgraphs as needed)
+const gateway = new ApolloGateway({
+  supergraphSdl: new IntrospectAndCompose({
+    subgraphs: [
+    ],
+  }),
+});
+
+const server = new ApolloServer<Context>({
+  gateway, // Attach the Apollo Gateway
+  cacheControl: {
+    defaultMaxAge: 5, // Cache control settings
+  },
+  cache: 'bounded',
+  formatError: (err) => {
+    if (Meteor.isProduction) {
+      return { message: err.extensions?.code || 'Internal Server Error' };
+    }
+    console.error(err);
+    return err;
+  },
+  plugins: [ApolloServerPluginUsageReportingDisabled()]
+});
+
+const startApolloGateway = async (server: ApolloServer<Context>) => {
+  await server.start();
+
+  // Use Meteor's WebApp to handle the Apollo middleware
+  WebApp.connectHandlers.use(
+    '/graphql', // The endpoint for the federated GraphQL API
+    express.json({ limit: '5mb' }), // Handle JSON requests
+    expressMiddleware(server, {
+      context: async ({ req }: { req: Request }): Promise<Context> => {
+        const token = req.headers.authorization || null;
+        return { token }; // Pass token for authentication
+      },
+    }),
+  );
+};
+
+// Start the Apollo Gateway server
+startApolloGateway(server);

package/bundle/typescript/src/templates/meteor/api/graphql-api.js

@@ -1,63 +1,63 @@
-import { resolvers } from './graphql/resolvers';
-import { typeDefs } from './graphql/typeDefs';
-
-import { ApolloServer } from '@apollo/server';
-import { ApolloServerPluginUsageReportingDisabled } from '@apollo/server/plugin/disabled';
-import { WebApp } from 'meteor/webapp';
-import { expressMiddleware } from '@as-integrations/express5';
-import { buildSubgraphSchema } from '@apollo/subgraph';
-import express from 'express';
-import { rateLimit, ipKeyGenerator } from 'express-rate-limit';
-
-// Create rate limiter middleware
-const limiter = rateLimit({
-  windowMs: 15 * 60 * 1000, // 15 minutes
-  max: 100, // Limit each IP to 100 requests per windowMs
-  message: 'Too many requests, please try again later.',
-  standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
-  legacyHeaders: false, // Disable the `X-RateLimit-*` headers,
-  keyGenerator: (req) => {
-    // Trust the 'X-Forwarded-For' header for client IP, but only if it exists
-    return req.headers['x-forwarded-for'] || ipKeyGenerator(req.ip);
-  }
-});
-
-const server = new ApolloServer({
-  schema: buildSubgraphSchema({ typeDefs, resolvers }),
-  cacheControl: {
-    defaultMaxAge: 5, // seconds
-  },
-  cache: 'bounded',
-  formatError: (err) => {
-    if (Meteor.isProduction) {
-      // Don't give specific errors to the client
-      err.message = err.extensions.code; // eslint-disable-line no-param-reassign
-      return err;
-    }
-    console.error(err);
-    return err;
-  },
-  validate: true, // Validates the schema on startup
-  plugins: [ApolloServerPluginUsageReportingDisabled()]
-});
-
-const startApolloServer = async (server) => {
-  await server.start();
-
-  // Use Meteor's built-in WebApp and Express's built-in JSON parser
-  WebApp.connectHandlers.use(
-    '/graphql/<%= apiVersion %>/<%= fileName %>',
-    limiter, // Apply rate limiter middleware before GraphQL middleware
-    express.json({ limit: '5mb' }),
-    expressMiddleware(server, {
-      context: async ({ req }) => {
-        const token = req.headers.authorization;
-        // Validate and decode token here, e.g., using JWT:
-        return { token };
-      }
-    }),
-  );
-};
-
-// Start the Apollo server
-startApolloServer(server);
+import { resolvers } from './graphql/resolvers';
+import { typeDefs } from './graphql/typeDefs';
+
+import { ApolloServer } from '@apollo/server';
+import { ApolloServerPluginUsageReportingDisabled } from '@apollo/server/plugin/disabled';
+import { WebApp } from 'meteor/webapp';
+import { expressMiddleware } from '@as-integrations/express5';
+import { buildSubgraphSchema } from '@apollo/subgraph';
+import express from 'express';
+import { rateLimit, ipKeyGenerator } from 'express-rate-limit';
+
+// Create rate limiter middleware
+const limiter = rateLimit({
+  windowMs: 15 * 60 * 1000, // 15 minutes
+  max: 100, // Limit each IP to 100 requests per windowMs
+  message: 'Too many requests, please try again later.',
+  standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
+  legacyHeaders: false, // Disable the `X-RateLimit-*` headers,
+  keyGenerator: (req) => {
+    // Trust the 'X-Forwarded-For' header for client IP, but only if it exists
+    return req.headers['x-forwarded-for'] || ipKeyGenerator(req.ip);
+  }
+});
+
+const server = new ApolloServer({
+  schema: buildSubgraphSchema({ typeDefs, resolvers }),
+  cacheControl: {
+    defaultMaxAge: 5, // seconds
+  },
+  cache: 'bounded',
+  formatError: (err) => {
+    if (Meteor.isProduction) {
+      // Don't give specific errors to the client
+      err.message = err.extensions.code; // eslint-disable-line no-param-reassign
+      return err;
+    }
+    console.error(err);
+    return err;
+  },
+  validate: true, // Validates the schema on startup
+  plugins: [ApolloServerPluginUsageReportingDisabled()]
+});
+
+const startApolloServer = async (server) => {
+  await server.start();
+
+  // Use Meteor's built-in WebApp and Express's built-in JSON parser
+  WebApp.connectHandlers.use(
+    '/graphql/<%= apiVersion %>/<%= fileName %>',
+    limiter, // Apply rate limiter middleware before GraphQL middleware
+    express.json({ limit: '5mb' }),
+    expressMiddleware(server, {
+      context: async ({ req }) => {
+        const token = req.headers.authorization;
+        // Validate and decode token here, e.g., using JWT:
+        return { token };
+      }
+    }),
+  );
+};
+
+// Start the Apollo server
+startApolloServer(server);

package/bundle/typescript/src/templates/meteor/api/graphql-api.js.ts

@@ -1,69 +1,69 @@
-import { resolvers } from './graphql/resolvers';
-import { typeDefs } from './graphql/typeDefs';
-
-import { ApolloServer } from '@apollo/server';
-import { ApolloServerPluginUsageReportingDisabled } from '@apollo/server/plugin/disabled';
-import { WebApp } from 'meteor/webapp';
-import { expressMiddleware } from '@as-integrations/express5';
-import { buildSubgraphSchema } from '@apollo/subgraph';
-import express, { Request } from 'express';
-import { rateLimit, ipKeyGenerator } from 'express-rate-limit';
-
-// Define the types for the context
-interface Context {
-  token?: string;
-}
-
-// Create rate limiter middleware
-const limiter = rateLimit({
-  windowMs: 15 * 60 * 1000, // 15 minutes
-  max: 100, // Limit each IP to 100 requests per windowMs
-  message: 'Too many requests, please try again later.',
-  standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
-  legacyHeaders: false, // Disable the `X-RateLimit-*` headers
-  keyGenerator: (req: Request) => {
-    // Trust the 'X-Forwarded-For' header for client IP, but only if it exists
-    return req.headers['x-forwarded-for'] || ipKeyGenerator(req.ip);
-  }
-});
-
-// Create the Apollo Server instance
-const server = new ApolloServer<Context>({
-  schema: buildSubgraphSchema({ typeDefs, resolvers }), // Federation-ready schema
-  cacheControl: {
-    defaultMaxAge: 5, // seconds
-  },
-  cache: 'bounded',
-  formatError: (err) => {
-    if (Meteor.isProduction) {
-      // Hide specific error details in production
-      err.message = err.extensions?.code || 'Internal Server Error'; // eslint-disable-line no-param-reassign
-      return err;
-    }
-    console.error(err);
-    return err;
-  },
-  validate: true, // Validates the schema on startup
-  plugins: [ApolloServerPluginUsageReportingDisabled()]
-});
-
-const startApolloServer = async (server: ApolloServer<Context>) => {
-  await server.start();
-
-  // Use Meteor's WebApp with Express's JSON parser
-  WebApp.connectHandlers.use(
-    '/graphql/<%= apiVersion %>/<%= fileName %>',
-    limiter, // Apply rate limiter middleware before GraphQL middleware
-    express.json({ limit: '5mb' }), // JSON parsing middleware
-    expressMiddleware(server, {
-      context: async ({ req }: { req: Request }): Promise<Context> => {
-        const token = req.headers.authorization || null;
-        // You can add additional validation here (e.g., JWT validation)
-        return { token };
-      },
-    }),
-  );
-};
-
-// Start the Apollo server
-startApolloServer(server);
+import { resolvers } from './graphql/resolvers';
+import { typeDefs } from './graphql/typeDefs';
+
+import { ApolloServer } from '@apollo/server';
+import { ApolloServerPluginUsageReportingDisabled } from '@apollo/server/plugin/disabled';
+import { WebApp } from 'meteor/webapp';
+import { expressMiddleware } from '@as-integrations/express5';
+import { buildSubgraphSchema } from '@apollo/subgraph';
+import express, { Request } from 'express';
+import { rateLimit, ipKeyGenerator } from 'express-rate-limit';
+
+// Define the types for the context
+interface Context {
+  token?: string;
+}
+
+// Create rate limiter middleware
+const limiter = rateLimit({
+  windowMs: 15 * 60 * 1000, // 15 minutes
+  max: 100, // Limit each IP to 100 requests per windowMs
+  message: 'Too many requests, please try again later.',
+  standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
+  legacyHeaders: false, // Disable the `X-RateLimit-*` headers
+  keyGenerator: (req: Request) => {
+    // Trust the 'X-Forwarded-For' header for client IP, but only if it exists
+    return req.headers['x-forwarded-for'] || ipKeyGenerator(req.ip);
+  }
+});
+
+// Create the Apollo Server instance
+const server = new ApolloServer<Context>({
+  schema: buildSubgraphSchema({ typeDefs, resolvers }), // Federation-ready schema
+  cacheControl: {
+    defaultMaxAge: 5, // seconds
+  },
+  cache: 'bounded',
+  formatError: (err) => {
+    if (Meteor.isProduction) {
+      // Hide specific error details in production
+      err.message = err.extensions?.code || 'Internal Server Error'; // eslint-disable-line no-param-reassign
+      return err;
+    }
+    console.error(err);
+    return err;
+  },
+  validate: true, // Validates the schema on startup
+  plugins: [ApolloServerPluginUsageReportingDisabled()]
+});
+
+const startApolloServer = async (server: ApolloServer<Context>) => {
+  await server.start();
+
+  // Use Meteor's WebApp with Express's JSON parser
+  WebApp.connectHandlers.use(
+    '/graphql/<%= apiVersion %>/<%= fileName %>',
+    limiter, // Apply rate limiter middleware before GraphQL middleware
+    express.json({ limit: '5mb' }), // JSON parsing middleware
+    expressMiddleware(server, {
+      context: async ({ req }: { req: Request }): Promise<Context> => {
+        const token = req.headers.authorization || null;
+        // You can add additional validation here (e.g., JWT validation)
+        return { token };
+      },
+    }),
+  );
+};
+
+// Start the Apollo server
+startApolloServer(server);

package/bundle/typescript/src/templates/meteor/api/methods.js

@@ -1,39 +1,39 @@
-import { Meteor } from 'meteor/meteor';
-import { ValidatedMethod } from 'meteor/mdg:validated-method';
-import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
-
-
-/**
- * Using ValidatedMethod (maintained by MDG) is the best
- * practice by Meteor Development Group (MDG),
- * and as such is used here to validate that method
- * calls from the client are properly handled.
- *
- */
-const <%= name %>Status = new ValidatedMethod({
-  name: '<%= fileName %>-<%= apiVersion %>-status',
-  validate() {
-    // check(this.userId, String, 'while validating user');
-  },
-  run() {
-    return 'OK';
-  }
-});
-
-const RATE_LIMITED_METHODS = [
-  <%= name %>Status
-].map(value => value['name']);
-
-if (Meteor.isServer) {
-  const OPERATIONS = 5;
-  const PER_SECOND = 1 * 1000; // milliseconds
-  // Only allow 5 list operations per connection per second.
-  DDPRateLimiter.addRule({
-    name(name) {
-      return RATE_LIMITED_METHODS.includes(name);
-    },
-
-    // Rate limit per connection ID.
-    connectionId() { return true; },
-  }, OPERATIONS, PER_SECOND);
-}
+import { Meteor } from 'meteor/meteor';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
+
+
+/**
+ * Using ValidatedMethod (maintained by MDG) is the best
+ * practice by Meteor Development Group (MDG),
+ * and as such is used here to validate that method
+ * calls from the client are properly handled.
+ *
+ */
+const <%= name %>Status = new ValidatedMethod({
+  name: '<%= fileName %>-<%= apiVersion %>-status',
+  validate() {
+    // check(this.userId, String, 'while validating user');
+  },
+  run() {
+    return 'OK';
+  }
+});
+
+const RATE_LIMITED_METHODS = [
+  <%= name %>Status
+].map(value => value['name']);
+
+if (Meteor.isServer) {
+  const OPERATIONS = 5;
+  const PER_SECOND = 1 * 1000; // milliseconds
+  // Only allow 5 list operations per connection per second.
+  DDPRateLimiter.addRule({
+    name(name) {
+      return RATE_LIMITED_METHODS.includes(name);
+    },
+
+    // Rate limit per connection ID.
+    connectionId() { return true; },
+  }, OPERATIONS, PER_SECOND);
+}

package/bundle/typescript/src/templates/meteor/api/methods.js.ts

@@ -1,40 +1,40 @@
-import { Meteor } from 'meteor/meteor';
-import { ValidatedMethod } from 'meteor/mdg:validated-method';
-import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
-
-
-/**
- * Using ValidatedMethod (maintained by MDG) is the best
- * practice by Meteor Development Group (MDG),
- * and as such is used here to validate that method
- * calls from the client are properly handled.
- *
- */
-const <%= name %>Status = new ValidatedMethod({
-  name: '<%= fileName %>-<%= apiVersion %>status',
-  validate() {
-    // check(this.userId, String, 'while validating user');
-  },
-  run() {
-    return 'OK';
-  }
-});
-
-const RATE_LIMITED_METHODS = [
-  <%= name %>Status
-].map(value => value['name']);
-
-if (Meteor.isServer) {
-  const OPERATIONS = 5;
-  const PER_SECOND = 1 * 1000; // milliseconds
-  // Only allow 5 list operations per connection per second.
-  DDPRateLimiter.addRule({
-    name(name) {
-      return RATE_LIMITED_METHODS.includes(name);
-    },
-
-    // Rate limit per connection ID.
-    connectionId() { return true; },
-  }, OPERATIONS, PER_SECOND);
-}
-
+import { Meteor } from 'meteor/meteor';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
+
+
+/**
+ * Using ValidatedMethod (maintained by MDG) is the best
+ * practice by Meteor Development Group (MDG),
+ * and as such is used here to validate that method
+ * calls from the client are properly handled.
+ *
+ */
+const <%= name %>Status = new ValidatedMethod({
+  name: '<%= fileName %>-<%= apiVersion %>status',
+  validate() {
+    // check(this.userId, String, 'while validating user');
+  },
+  run() {
+    return 'OK';
+  }
+});
+
+const RATE_LIMITED_METHODS = [
+  <%= name %>Status
+].map(value => value['name']);
+
+if (Meteor.isServer) {
+  const OPERATIONS = 5;
+  const PER_SECOND = 1 * 1000; // milliseconds
+  // Only allow 5 list operations per connection per second.
+  DDPRateLimiter.addRule({
+    name(name) {
+      return RATE_LIMITED_METHODS.includes(name);
+    },
+
+    // Rate limit per connection ID.
+    connectionId() { return true; },
+  }, OPERATIONS, PER_SECOND);
+}
+

package/bundle/typescript/src/templates/meteor/api/register-api.js

@@ -1,3 +1,3 @@
-<% if( withMethods ) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-rpc-methods';<% } %>
-<% if( withRest ) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-rest-api';<% } %>
-<% if (withGql) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-graphql-api';<% } %>
+<% if( withMethods ) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-rpc-methods';<% } %>
+<% if( withRest ) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-rest-api';<% } %>
+<% if (withGql) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-graphql-api';<% } %>

package/bundle/typescript/src/templates/meteor/api/register-api.js.ts

@@ -1,3 +1,3 @@
-<% if( withMethods ) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-rpc-methods';<% } %>
-<% if( withRest ) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-rest-api';<% } %>
-<% if (withGql) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-graphql-api';<% } %>
+<% if( withMethods ) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-rpc-methods';<% } %>
+<% if( withRest ) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-rest-api';<% } %>
+<% if (withGql) { %>import '../../api/<%= apiVersion %><%= optsDir %><%= fileName %>/<%= fileName %>-<%= apiVersion %>-graphql-api';<% } %>

package/bundle/typescript/src/templates/meteor/api/resolvers.js

@@ -1,9 +1,9 @@
-export const resolvers = {
-  Query: {
-   async <%= camelCase %>(root, args, context) {
-      // How to enable authentication
-      // if (!context.user._id && !Meteor.isDevelopment) throw 'UNAUTHORIZED';
-      return 'hello <%= camelCase %>';
-    }
-  }
-};
+export const resolvers = {
+  Query: {
+   async <%= camelCase %>(root, args, context) {
+      // How to enable authentication
+      // if (!context.user._id && !Meteor.isDevelopment) throw 'UNAUTHORIZED';
+      return 'hello <%= camelCase %>';
+    }
+  }
+};

package/bundle/typescript/src/templates/meteor/api/resolvers.js.ts

@@ -1,9 +1,9 @@
-export const resolvers = {
-  Query: {
-    async <%= camelCase %>(root, args, context) {
-      // How to enable authentication
-      // if (!context.user._id && !Meteor.isDevelopment) throw 'UNAUTHORIZED';
-      return 'hello <%= camelCase %>';
-    }
-  }
-};
+export const resolvers = {
+  Query: {
+    async <%= camelCase %>(root, args, context) {
+      // How to enable authentication
+      // if (!context.user._id && !Meteor.isDevelopment) throw 'UNAUTHORIZED';
+      return 'hello <%= camelCase %>';
+    }
+  }
+};

package/bundle/typescript/src/templates/meteor/api/typeDefs.js

@@ -1,6 +1,6 @@
-import { gql } from 'graphql-tag';
-export const typeDefs = gql`
-  type Query {
-    <%= camelCase %>: String
-  }
-`;
+import { gql } from 'graphql-tag';
+export const typeDefs = gql`
+  type Query {
+    <%= camelCase %>: String
+  }
+`;

package/bundle/typescript/src/templates/meteor/api/typeDefs.js.ts

@@ -1,6 +1,6 @@
-import { gql } from 'graphql-tag';
-export const typeDefs = gql`
-  type Query {
-    <%= camelCase %>: String
-  }
-`;
+import { gql } from 'graphql-tag';
+export const typeDefs = gql`
+  type Query {
+    <%= camelCase %>: String
+  }
+`;

package/bundle/typescript/src/templates/meteor/app/client/body.html

@@ -1,3 +1,3 @@
-<body><% if (config.engines.client === 'react' || config.engines.client === 'reflux' || config.engines.client === 'vanilla') { %>
-    <div id="app"></div><% } %>
-</body>
+<body><% if (config.engines.client === 'react' || config.engines.client === 'reflux' || config.engines.client === 'vanilla') { %>
+    <div id="app"></div><% } %>
+</body>