Skip to content

Commit

Permalink
ESM updates, styling & configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
jondot committed Feb 27, 2022
1 parent 015352b commit 6c43f26
Show file tree
Hide file tree
Showing 77 changed files with 314 additions and 217 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('stylomatic/eslint-preset')
module.exports = require('stylomatic/eslint-preset')
2 changes: 1 addition & 1 deletion dist/bin.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const defaultTemplates = path_1.default.join(__dirname, '../src/templates');
debug: !!process.env.DEBUG,
exec: (action, body) => {
const opts = body && body.length > 0 ? { input: body } : {};
return require('execa').command(action, Object.assign(Object.assign({}, opts), { shell: true }));
return require('execa').command(action, Object.assign(Object.assign({}, opts), { shell: true })); // eslint-disable-line @typescript-eslint/no-var-requires
},
createPrompter: () => require('enquirer'),
}).then(({ success }) => process.exit(success ? 0 : 1));
1 change: 0 additions & 1 deletion dist/bin.timed.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// this require is used in dev only anyways
// eslint-disable-next-line
require('time-require');
require('./bin');
2 changes: 1 addition & 1 deletion dist/config-resolver.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RunnerConfig } from './types';
import type { RunnerConfig } from './types';
declare const _default: (config: RunnerConfig) => Promise<RunnerConfig>;
export default _default;
//# sourceMappingURL=config-resolver.d.ts.map
2 changes: 1 addition & 1 deletion dist/config-resolver.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 22 additions & 4 deletions dist/config-resolver.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
"use strict";
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
Expand All @@ -17,12 +36,11 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
const config_1 = require("./config");
const configResolver = new config_1.ConfigResolver('.hygen.js', {
exists: fs_extra_1.default.exists,
// $FlowFixMe
load: f => Promise.resolve(require(f)),
none: _ => ({}),
load: (f) => __awaiter(void 0, void 0, void 0, function* () { return yield Promise.resolve().then(() => __importStar(require(f))); }),
none: (_) => ({}),
});
exports.default = (config) => __awaiter(void 0, void 0, void 0, function* () {
const { cwd, templates } = config;
const resolvedTemplates = [process.env.HYGEN_TMPLS, path_1.default.join(cwd, '_templates')].find(_ => _ && fs_extra_1.default.existsSync(_)) || templates;
const resolvedTemplates = [process.env.HYGEN_TMPLS, path_1.default.join(cwd, '_templates')].find((_) => _ && fs_extra_1.default.existsSync(_)) || templates;
return Object.assign(Object.assign(Object.assign({}, config), { templates: resolvedTemplates }), (yield configResolver.resolve(cwd)));
});
2 changes: 1 addition & 1 deletion dist/config.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ResolverIO } from './types';
import type { ResolverIO } from './types';
declare const reversePathsToWalk: ({ folder, path }: {
folder: any;
path: any;
Expand Down
2 changes: 1 addition & 1 deletion dist/config.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.reversePathsToWalk = exports.ConfigResolver = exports.configLookup = void 0;
const path_1 = __importDefault(require("path"));
// inline fp methods due to perf
const uniq = arr => arr.filter((elem, pos, a) => a.indexOf(elem) === pos);
const uniq = (arr) => arr.filter((elem, pos, a) => a.indexOf(elem) === pos);
const reversePathsToWalk = ({ folder, path }) => {
const resolved = path.resolve(folder);
const parts = resolved.split(path.sep);
Expand All @@ -24,7 +24,7 @@ const reversePathsToWalk = ({ folder, path }) => {
return results.reverse();
};
exports.reversePathsToWalk = reversePathsToWalk;
const configLookup = (file, folder, path = path_1.default) => uniq(reversePathsToWalk({ folder, path }).map(p => path.join(p, file)));
const configLookup = (file, folder, path = path_1.default) => uniq(reversePathsToWalk({ folder, path }).map((p) => path.join(p, file)));
exports.configLookup = configLookup;
class ConfigResolver {
constructor(configFile, io) {
Expand Down
2 changes: 1 addition & 1 deletion dist/context.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RunnerConfig } from './types';
import type { RunnerConfig } from './types';
declare const context: (locals: any, config?: RunnerConfig) => any;
export default context;
//# sourceMappingURL=context.d.ts.map
2 changes: 1 addition & 1 deletion dist/context.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/engine.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ActionResult, RunnerConfig } from './types';
import type { ActionResult, RunnerConfig } from './types';
declare class ShowHelpError extends Error {
constructor(message: string);
}
Expand Down
2 changes: 1 addition & 1 deletion dist/engine.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 21 additions & 2 deletions dist/engine.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
"use strict";
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
Expand Down Expand Up @@ -56,8 +75,8 @@ Options:
}
// lazy loading these dependencies gives a better feel once
// a user is exploring hygen (not specifying what to execute)
const execute = require('./execute').default;
const render = require('./render').default;
const execute = (yield Promise.resolve().then(() => __importStar(require('./execute')))).default;
const render = (yield Promise.resolve().then(() => __importStar(require('./render')))).default;
return execute(yield render(args, config), args, config);
});
exports.default = engine;
2 changes: 1 addition & 1 deletion dist/execute.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RunnerConfig, RenderedAction, ActionResult } from './types';
import type { ActionResult, RenderedAction, RunnerConfig } from './types';
declare const execute: (renderedActions: RenderedAction[], args: any, config: RunnerConfig) => Promise<ActionResult[]>;
export default execute;
//# sourceMappingURL=execute.d.ts.map
2 changes: 1 addition & 1 deletion dist/execute.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/execute.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const execute = (renderedActions, args, config) => __awaiter(void 0, void 0, voi
if (message) {
messages.push(message);
}
const ops = (0, ops_1.default)(action.attributes);
const ops = yield (0, ops_1.default)(action.attributes);
for (const op of ops) {
results.push(yield op(action, args, config));
}
Expand Down
2 changes: 1 addition & 1 deletion dist/help.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Logger } from './types';
import type { Logger } from './types';
declare const VERSION: any;
declare const availableActions: (templates: string) => {};
declare const printHelp: (templates: string, logger: Logger) => void;
Expand Down
2 changes: 1 addition & 1 deletion dist/help.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions dist/help.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ exports.VERSION = exports.printHelp = exports.availableActions = void 0;
const fs_1 = __importDefault(require("fs"));
const path_1 = __importDefault(require("path"));
const chalk_1 = __importDefault(require("chalk"));
const pkg = require('../package.json');
const pkg = require('../package.json'); // eslint-disable-line @typescript-eslint/no-var-requires
const VERSION = pkg.version;
exports.VERSION = VERSION;
const availableActions = (templates) => {
const generators = fs_1.default
.readdirSync(templates)
.filter(_ => fs_1.default.lstatSync(path_1.default.join(templates, _)).isDirectory());
.filter((_) => fs_1.default.lstatSync(path_1.default.join(templates, _)).isDirectory());
return generators.reduce((acc, generator) => {
const actions = fs_1.default.readdirSync(path_1.default.join(templates, generator));
acc[generator] = actions;
Expand Down Expand Up @@ -45,7 +45,6 @@ const printHelp = (templates, logger) => {
return;
}
Object.entries(availableActions(templates)).forEach(([k, v]) => {
// @ts-ignore
logger.log(`${chalk_1.default.bold(k)}: ${v.join(', ')}`);
});
};
Expand Down
2 changes: 1 addition & 1 deletion dist/helpers.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// <reference types="node" />
import changeCase from 'change-case';
import path from 'path';
import changeCase from 'change-case';
declare const helpers: {
capitalize(str: any): string;
inflection: any;
Expand Down
2 changes: 1 addition & 1 deletion dist/helpers.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const path_1 = __importDefault(require("path"));
const inflection_1 = __importDefault(require("inflection"));
const change_case_1 = __importDefault(require("change-case"));
const path_1 = __importDefault(require("path"));
// supports kebab-case to KebabCase
inflection_1.default.undasherize = (str) => str
.split(/[-_]/)
Expand Down
4 changes: 2 additions & 2 deletions dist/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { RunnerResult, RunnerConfig } from './types';
import type { RunnerConfig, RunnerResult } from './types';
import resolve from './config-resolver';
import Logger from './logger';
import engine from './engine';
import { printHelp, availableActions, VERSION } from './help';
import { VERSION, availableActions, printHelp } from './help';
declare const runner: (argv: string[], config: RunnerConfig) => Promise<RunnerResult>;
export { runner, engine, resolve, printHelp, availableActions, Logger, VERSION };
//# sourceMappingURL=index.d.ts.map
2 changes: 1 addition & 1 deletion dist/index.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ exports.Logger = logger_1.default;
const engine_1 = __importStar(require("./engine"));
exports.engine = engine_1.default;
const help_1 = require("./help");
Object.defineProperty(exports, "printHelp", { enumerable: true, get: function () { return help_1.printHelp; } });
Object.defineProperty(exports, "availableActions", { enumerable: true, get: function () { return help_1.availableActions; } });
Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return help_1.VERSION; } });
Object.defineProperty(exports, "availableActions", { enumerable: true, get: function () { return help_1.availableActions; } });
Object.defineProperty(exports, "printHelp", { enumerable: true, get: function () { return help_1.printHelp; } });
const runner = (argv, config) => __awaiter(void 0, void 0, void 0, function* () {
const resolvedConfig = yield (0, config_resolver_1.default)(config);
const { templates, logger } = resolvedConfig;
Expand Down
2 changes: 1 addition & 1 deletion dist/logger.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions dist/logger.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const chalk = require('chalk');
const { yellow, red, green, magenta, template } = chalk;
const chalk_1 = __importDefault(require("chalk"));
// chalk 4.1.2 doesn't type template property
const { yellow, red, green, magenta, template } = chalk_1.default;
class Logger {
constructor(log) {
this.log = log;
}
colorful(msg) {
this.log(template(chalk, msg));
this.log(template(chalk_1.default, msg));
}
notice(msg) {
this.log(magenta(msg));
Expand Down
2 changes: 1 addition & 1 deletion dist/newline.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/newline.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const os_1 = require("os");
const newline = string => {
const newline = (string) => {
const newlines = string.match(/(?:\r?\n)/g) || [];
if (newlines.length === 0) {
return os_1.EOL;
}
const crlf = newlines.filter(newline => newline === '\r\n').length;
const crlf = newlines.filter((newline) => newline === '\r\n').length;
const lf = newlines.length - crlf;
return crlf > lf ? '\r\n' : '\n';
};
Expand Down
2 changes: 1 addition & 1 deletion dist/ops/add.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ActionResult, RunnerConfig, RenderedAction } from '../types';
import type { ActionResult, RenderedAction, RunnerConfig } from '../types';
declare const add: (action: RenderedAction, args: any, { logger, cwd, createPrompter }: RunnerConfig) => Promise<ActionResult>;
export default add;
//# sourceMappingURL=add.d.ts.map
Loading

0 comments on commit 6c43f26

Please sign in to comment.