Skip to content

Commit

Permalink
chore: rename to codenizer
Browse files Browse the repository at this point in the history
  • Loading branch information
WinterYukky committed Aug 19, 2022
1 parent fd1d062 commit c577624
Show file tree
Hide file tree
Showing 14 changed files with 141 additions and 145 deletions.
204 changes: 102 additions & 102 deletions API.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export * from './lib/node';
export * from './lib/code-builder';
export * from './lib/codenizer';
export * from './lib/data-source';
export * from './lib/data-target';
export * from './lib/transform';
12 changes: 6 additions & 6 deletions src/lib/code-builder.ts → src/lib/codenizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export interface CodeFragment {
readonly tail?: string[];
}

export abstract class CodeBuilderBase extends Code {
export abstract class CodenizerBase extends Code {
constructor(
/**
* The Node you want to build.
Expand Down Expand Up @@ -111,7 +111,7 @@ export abstract class CodeBuilderBase extends Code {
/**
* Build Python code from nodes.
*/
export class PythonCodeBuilder extends CodeBuilderBase {
export class PythonCodenizer extends CodenizerBase {
private readonly core: CodeFragment = {
imports: [
'import sys',
Expand Down Expand Up @@ -149,13 +149,13 @@ export class PythonCodeBuilder extends CodeBuilderBase {
* Build Scala code from nodes.
* @todo Scala is not support yet.
*/
export class ScalaCodeBuilder extends CodeBuilderBase {
export class ScalaCodenizer extends CodenizerBase {
codenize(): string {
throw new Error('Method not implemented.');
}
}

export class CodeBuilder {
export class Codenizer {
static python(
/**
* The Node you want to build.
Expand All @@ -174,7 +174,7 @@ export class CodeBuilder {
*/
objectKey?: string
) {
return new PythonCodeBuilder(node, bucket, objectKey);
return new PythonCodenizer(node, bucket, objectKey);
}
static scala(
/**
Expand All @@ -194,6 +194,6 @@ export class CodeBuilder {
*/
objectKey?: string
) {
return new ScalaCodeBuilder(node, bucket, objectKey);
return new ScalaCodenizer(node, bucket, objectKey);
}
}
2 changes: 1 addition & 1 deletion src/lib/data-source.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { IDatabase, ITable } from '@aws-cdk/aws-glue-alpha';
import { Grant, IGrantable } from 'aws-cdk-lib/aws-iam';
import { IBucket } from 'aws-cdk-lib/aws-s3';
import { CodeFragment } from './code-builder';
import { CodeFragment } from './codenizer';
import { IGranter, NodeBase } from './node';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/data-target.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { IDatabase, ITable } from '@aws-cdk/aws-glue-alpha';
import { IGrantable, Grant } from 'aws-cdk-lib/aws-iam';
import { IBucket } from 'aws-cdk-lib/aws-s3';
import { CodeFragment } from './code-builder';
import { CodeFragment } from './codenizer';
import { IGranter, NodeBase } from './node';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/node.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Grant, IGrantable } from 'aws-cdk-lib/aws-iam';
import { CodeFragment } from './code-builder';
import { CodeFragment } from './codenizer';

/**
* A node of job.
Expand Down
2 changes: 1 addition & 1 deletion src/lib/transform/apply-mapping.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Column } from '@aws-cdk/aws-glue-alpha';
import { IGrantable, Grant } from 'aws-cdk-lib/aws-iam';
import { CodeFragment } from '../code-builder';
import { CodeFragment } from '../codenizer';
import { NodeBase } from '../node';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/transform/drop-fields.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IGrantable, Grant } from 'aws-cdk-lib/aws-iam';
import { CodeFragment } from '../code-builder';
import { CodeFragment } from '../codenizer';
import { NodeBase } from '../node';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/transform/drop-null-fields.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IGrantable, Grant } from 'aws-cdk-lib/aws-iam';
import { CodeFragment } from '../code-builder';
import { CodeFragment } from '../codenizer';
import { NodeBase } from '../node';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/transform/select-fields.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IGrantable, Grant } from 'aws-cdk-lib/aws-iam';
import { CodeFragment } from '../code-builder';
import { CodeFragment } from '../codenizer';
import { NodeBase } from '../node';

/**
Expand Down
42 changes: 19 additions & 23 deletions test/code-builder.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { App, Stack } from 'aws-cdk-lib';
import { Template } from 'aws-cdk-lib/assertions';
import { IGrantable, Grant } from 'aws-cdk-lib/aws-iam';
import { Bucket } from 'aws-cdk-lib/aws-s3';
import { CodeBuilder, CodeBuilderBase } from '../src';
import { Codenizer, CodenizerBase } from '../src';
import { SomeNode } from './node.test';

class DummyCodeNode extends SomeNode {
Expand All @@ -22,8 +22,8 @@ class DummyCodeNode extends SomeNode {
return undefined;
}
}
describe('CodeBuilderBase', () => {
class SomeCodeBuilder extends CodeBuilderBase {
describe('CodenizerBase', () => {
class SomeCodenizer extends CodenizerBase {
get nodes() {
return super.nodes;
}
Expand All @@ -46,23 +46,23 @@ describe('CodeBuilderBase', () => {
x5y1.to(x4y2).to(x3y3).to(x2y4).to(x1y5);

const expected = [x1y1, x5y1, x2y2, x4y2, x3y3, x2y4, x4y4, x1y5, x5y5];
expect(new SomeCodeBuilder(x1y1).nodes).toStrictEqual(expected);
expect(new SomeCodeBuilder(x5y1).nodes).toStrictEqual(expected);
expect(new SomeCodeBuilder(x2y2).nodes).toStrictEqual(expected);
expect(new SomeCodeBuilder(x4y2).nodes).toStrictEqual(expected);
expect(new SomeCodeBuilder(x3y3).nodes).toStrictEqual(expected);
expect(new SomeCodeBuilder(x2y4).nodes).toStrictEqual(expected);
expect(new SomeCodeBuilder(x4y4).nodes).toStrictEqual(expected);
expect(new SomeCodeBuilder(x1y5).nodes).toStrictEqual(expected);
expect(new SomeCodeBuilder(x5y5).nodes).toStrictEqual(expected);
expect(new SomeCodenizer(x1y1).nodes).toStrictEqual(expected);
expect(new SomeCodenizer(x5y1).nodes).toStrictEqual(expected);
expect(new SomeCodenizer(x2y2).nodes).toStrictEqual(expected);
expect(new SomeCodenizer(x4y2).nodes).toStrictEqual(expected);
expect(new SomeCodenizer(x3y3).nodes).toStrictEqual(expected);
expect(new SomeCodenizer(x2y4).nodes).toStrictEqual(expected);
expect(new SomeCodenizer(x4y4).nodes).toStrictEqual(expected);
expect(new SomeCodenizer(x1y5).nodes).toStrictEqual(expected);
expect(new SomeCodenizer(x5y5).nodes).toStrictEqual(expected);
});

test('Not provide bucket, create bucket', () => {
const app = new App();
const stack = new Stack(app, 'MyStack');
new Job(stack, 'Job', {
executable: JobExecutable.pythonEtl({
script: CodeBuilder.python(new DummyCodeNode('node')),
script: Codenizer.python(new DummyCodeNode('node')),
glueVersion: GlueVersion.V3_0,
pythonVersion: PythonVersion.THREE,
}),
Expand All @@ -79,11 +79,7 @@ describe('CodeBuilderBase', () => {
});
new Job(stack, 'Job', {
executable: JobExecutable.pythonEtl({
script: CodeBuilder.python(
new DummyCodeNode('node'),
bucket,
'my-path'
),
script: Codenizer.python(new DummyCodeNode('node'), bucket, 'my-path'),
glueVersion: GlueVersion.V3_0,
pythonVersion: PythonVersion.THREE,
}),
Expand All @@ -96,14 +92,14 @@ describe('CodeBuilderBase', () => {
});
});

describe('PythonCodeBuilder', () => {
describe('PythonCodenizer', () => {
test('generate script order by generation', () => {
const node1 = new DummyCodeNode('node1');
const node2 = new DummyCodeNode('node2');
const node3 = new DummyCodeNode('node3');
const node4 = new SomeNode('node4');
const node = node3.to(node4).to(node2).to(node1);
const script = CodeBuilder.python(node).codenize();
const script = Codenizer.python(node).codenize();
expect(script).toBe(`import sys
from awsglue.transforms import *
from awsglue.utils import getResolvedOptions
Expand Down Expand Up @@ -139,15 +135,15 @@ job.commit()`);
const node = node3.to(node2).to(node1);
new Job(stack, 'Job', {
executable: JobExecutable.pythonEtl({
script: CodeBuilder.python(node),
script: Codenizer.python(node),
glueVersion: GlueVersion.V3_0,
pythonVersion: PythonVersion.THREE,
}),
});
});
});

describe('ScalaCodeBuilder', () => {
describe('ScalaCodenizer', () => {
test('Scala is not support yet so throw error', () => {
const app = new App();
const stack = new Stack(app, 'MyStack');
Expand All @@ -159,7 +155,7 @@ describe('ScalaCodeBuilder', () => {
() =>
new Job(stack, 'Job', {
executable: JobExecutable.scalaEtl({
script: CodeBuilder.scala(node),
script: Codenizer.scala(node),
glueVersion: GlueVersion.V3_0,
className: 'GlueApp',
}),
Expand Down
4 changes: 2 additions & 2 deletions test/integ/drop-fields.integ.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as glue from '@aws-cdk/aws-glue-alpha';
import { App, Stack } from 'aws-cdk-lib';
import { Source } from 'aws-cdk-lib/aws-s3-deployment';
import { CodeBuilder, DataSource, DataTarget, Transform } from '../../src';
import { Codenizer, DataSource, DataTarget, Transform } from '../../src';
import { Catalog, JobTest } from './util';

const app = new App();
Expand Down Expand Up @@ -46,7 +46,7 @@ const jobGraph = source.to(dropName).to(target);

const job = new glue.Job(stack, 'Job', {
executable: glue.JobExecutable.pythonEtl({
script: CodeBuilder.python(jobGraph),
script: Codenizer.python(jobGraph),
glueVersion: glue.GlueVersion.V3_0,
pythonVersion: glue.PythonVersion.THREE,
}),
Expand Down
4 changes: 2 additions & 2 deletions test/integ/drop-null-fields.integ.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as glue from '@aws-cdk/aws-glue-alpha';
import { App, Stack } from 'aws-cdk-lib';
import { Source } from 'aws-cdk-lib/aws-s3-deployment';
import { CodeBuilder, DataSource, DataTarget, Transform } from '../../src';
import { Codenizer, DataSource, DataTarget, Transform } from '../../src';
import { RepresentNullValue } from '../../src/lib/transform/drop-null-fields';
import { Catalog, JobTest } from './util';

Expand Down Expand Up @@ -67,7 +67,7 @@ const jobGraph = source.to(dropName).to(target);

const job = new glue.Job(stack, 'Job', {
executable: glue.JobExecutable.pythonEtl({
script: CodeBuilder.python(jobGraph),
script: Codenizer.python(jobGraph),
glueVersion: glue.GlueVersion.V3_0,
pythonVersion: glue.PythonVersion.THREE,
}),
Expand Down
4 changes: 2 additions & 2 deletions test/integ/select-fields.integ.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as glue from '@aws-cdk/aws-glue-alpha';
import { App, Stack } from 'aws-cdk-lib';
import { Source } from 'aws-cdk-lib/aws-s3-deployment';
import { CodeBuilder, DataSource, DataTarget, Transform } from '../../src';
import { Codenizer, DataSource, DataTarget, Transform } from '../../src';
import { Catalog, JobTest } from './util';

const app = new App();
Expand Down Expand Up @@ -46,7 +46,7 @@ const jobGraph = source.to(dropName).to(target);

const job = new glue.Job(stack, 'Job', {
executable: glue.JobExecutable.pythonEtl({
script: CodeBuilder.python(jobGraph),
script: Codenizer.python(jobGraph),
glueVersion: glue.GlueVersion.V3_0,
pythonVersion: glue.PythonVersion.THREE,
}),
Expand Down

0 comments on commit c577624

Please sign in to comment.